From 2af637385ab5e0da12d89c3e97868cea8251a0ed Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 16 Jun 2023 23:54:03 +0200 Subject: [PATCH 001/134] Update atm.json: increase merge range --- assets/themes/atm/atm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json index f373e5203..f056ba0b8 100644 --- a/assets/themes/atm/atm.json +++ b/assets/themes/atm/atm.json @@ -67,7 +67,7 @@ "calculatedTags": [ "_closest_osm_poi=closest(feat)('atm')?.properties?.id", "_closest_osm_poi_distance=Math.round(distanceTo(feat)(feat.properties._closest_osm_poi))", - "_has_closeby_feature=Number(feat.properties._closest_osm_poi_distance) < 50 ? 'yes' : 'no'" + "_has_closeby_feature=Number(feat.properties._closest_osm_poi_distance) < 150 ? 'yes' : 'no'" ], "=tagRenderings": [ { From 124cfad8f888ad9658feec5b38970bebc1a41a1f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 20 Jul 2023 13:28:38 +0200 Subject: [PATCH 002/134] Docs: Improve docs, fix doc script --- Docs/BuiltinIndex.md | 5 + Docs/BuiltinQuestions.md | 524 +---- Docs/CalculatedTags.md | 13 +- Docs/Layers/advertising.md | 4 +- Docs/Layers/all_streets.md | 2 +- Docs/Layers/ambulancestation.md | 2 +- Docs/Layers/artwork.md | 198 +- Docs/Layers/atm.md | 2 +- Docs/Layers/barrier.md | 2 +- Docs/Layers/bench.md | 116 +- Docs/Layers/bench_at_pt.md | 2 +- Docs/Layers/bicycle_library.md | 2 +- Docs/Layers/bicycle_rental.md | 2 +- Docs/Layers/bicycle_rental_non_docking.md | 2 +- Docs/Layers/bicycle_tube_vending_machine.md | 2 +- Docs/Layers/bike_cafe.md | 2 +- Docs/Layers/bike_cleaning.md | 2 +- Docs/Layers/bike_parking.md | 2 +- Docs/Layers/bike_repair_station.md | 2 +- Docs/Layers/bike_shop.md | 182 +- Docs/Layers/bike_themed_object.md | 2 +- Docs/Layers/binocular.md | 2 +- Docs/Layers/birdhide.md | 2 +- Docs/Layers/cafe_pub.md | 2 +- Docs/Layers/car_rental.md | 2 +- Docs/Layers/caravansites.md | 4 +- Docs/Layers/charging_station.md | 8 +- Docs/Layers/charging_station_ebikes.md | 8 +- Docs/Layers/climbing_area.md | 60 +- Docs/Layers/climbing_gym.md | 113 +- Docs/Layers/climbing_route.md | 2 +- Docs/Layers/clock.md | 2 +- Docs/Layers/crossings.md | 2 +- .../cultural_places_without_etymology.md | 2 +- Docs/Layers/defibrillator.md | 2 +- Docs/Layers/dentist.md | 2 +- Docs/Layers/doctors.md | 2 +- Docs/Layers/dogfoodb.md | 2 +- Docs/Layers/dogpark.md | 2 +- Docs/Layers/dogshop.md | 183 +- Docs/Layers/drinking_water.md | 2 +- Docs/Layers/dumpstations.md | 2 +- ...ducation_institutions_without_etymology.md | 2 +- Docs/Layers/elevator.md | 2 +- Docs/Layers/elongated_coin.md | 320 +++ Docs/Layers/entrance.md | 2 +- Docs/Layers/etymology.md | 2 +- Docs/Layers/extinguisher.md | 2 +- Docs/Layers/facadegardens.md | 2 +- Docs/Layers/fietsstraat.md | 2 +- Docs/Layers/fire_station.md | 2 +- Docs/Layers/fitness_centre.md | 2 +- Docs/Layers/fitness_station.md | 2 +- Docs/Layers/food.md | 2 +- Docs/Layers/friture.md | 2 +- Docs/Layers/ghost_bike.md | 2 +- Docs/Layers/governments.md | 2 +- Docs/Layers/hackerspace.md | 4 +- ...lth_and_social_places_without_etymology.md | 2 +- Docs/Layers/hotel.md | 2 +- Docs/Layers/hydrant.md | 2 +- Docs/Layers/indoors.md | 2 +- Docs/Layers/information_board.md | 2 +- Docs/Layers/kerbs.md | 2 +- Docs/Layers/lit_streets.md | 2 +- Docs/Layers/map.md | 4 +- Docs/Layers/medical-shops.md | 185 +- Docs/Layers/nature_reserve.md | 2 +- Docs/Layers/observation_tower.md | 4 +- Docs/Layers/parcel_lockers.md | 2 +- Docs/Layers/parking.md | 2 +- Docs/Layers/parking_spaces.md | 2 +- Docs/Layers/parking_ticket_machine.md | 6 +- .../parks_and_forests_without_etymology.md | 2 +- Docs/Layers/pharmacy.md | 2 +- Docs/Layers/physiotherapist.md | 2 +- Docs/Layers/picnic_table.md | 2 +- Docs/Layers/play_forest.md | 4 +- Docs/Layers/playground.md | 4 +- Docs/Layers/postboxes.md | 2 +- Docs/Layers/postoffices.md | 2 +- Docs/Layers/public_bookcase.md | 2 +- Docs/Layers/rainbow_crossing_high_zoom.md | 2 +- Docs/Layers/rainbow_crossings.md | 2 +- Docs/Layers/reception_desk.md | 2 +- Docs/Layers/recycling.md | 2 +- Docs/Layers/shops.md | 185 +- .../Layers/shops_with_climbing_shoe_repair.md | 4 +- Docs/Layers/shower.md | 2 +- Docs/Layers/slow_roads.md | 2 +- Docs/Layers/sport_pitch.md | 4 +- Docs/Layers/sport_places_without_etymology.md | 2 +- Docs/Layers/sport_shops.md | 183 +- Docs/Layers/sports_centre.md | 2 +- Docs/Layers/stairs.md | 2 +- Docs/Layers/street_lamps.md | 2 +- Docs/Layers/streets_without_etymology.md | 4 +- Docs/Layers/surveillance_camera.md | 2 +- Docs/Layers/tertiary_education.md | 34 + Docs/Layers/ticket_machine.md | 6 +- Docs/Layers/ticket_validator.md | 2 +- Docs/Layers/toekomstige_fietsstraat.md | 2 +- Docs/Layers/toilet.md | 2 +- Docs/Layers/toilet_at_amenity.md | 74 +- .../toursistic_places_without_etymology.md | 2 +- Docs/Layers/trail.md | 2 +- Docs/Layers/transit_stops.md | 2 +- Docs/Layers/tree_node.md | 2 +- Docs/Layers/vending_machine.md | 7 +- Docs/Layers/viewpoint.md | 2 +- Docs/Layers/village_green.md | 2 +- Docs/Layers/waste_basket.md | 2 +- Docs/Layers/waste_disposal.md | 2 +- Docs/Layers/windturbine.md | 2 +- Docs/SpecialInputElements.md | 2 +- Docs/SpecialRenderings.md | 2 +- Docs/TagInfo/mapcomplete_artwork.json | 149 ++ Docs/TagInfo/mapcomplete_benches.json | 85 + Docs/TagInfo/mapcomplete_climbing.json | 124 ++ Docs/TagInfo/mapcomplete_cyclofix.json | 91 + Docs/TagInfo/mapcomplete_education.json | 24 + Docs/TagInfo/mapcomplete_elongated_coin.json | 207 ++ Docs/TagInfo/mapcomplete_healthcare.json | 1608 +++++++++++++++ Docs/TagInfo/mapcomplete_maps.json | 2 +- Docs/TagInfo/mapcomplete_nature.json | 87 +- Docs/TagInfo/mapcomplete_onwheels.json | 804 ++++++++ Docs/TagInfo/mapcomplete_parkings.json | 30 +- Docs/TagInfo/mapcomplete_personal.json | 1718 ++++++++++++++++- Docs/TagInfo/mapcomplete_pets.json | 804 ++++++++ Docs/TagInfo/mapcomplete_shops.json | 804 ++++++++ Docs/TagInfo/mapcomplete_sports.json | 804 ++++++++ Docs/TagInfo/mapcomplete_toilets.json | 74 + Docs/TagInfo/mapcomplete_vending_machine.json | 30 +- Docs/Themes/mapcomplete-changes.md | 2 - Docs/Themes/personal.md | 1 + Docs/URL_Parameters.md | 13 +- Docs/wikiIndex.txt | 9 + .../mapcomplete-changes.json | 97 +- scripts/generateDocs.ts | 12 +- src/Customizations/SharedTagRenderings.ts | 71 - src/Models/ThemeConfig/WithContextLoader.ts | 7 - src/UI/i18n/Locale.ts | 33 +- 142 files changed, 9404 insertions(+), 908 deletions(-) create mode 100644 Docs/Layers/elongated_coin.md create mode 100644 Docs/TagInfo/mapcomplete_elongated_coin.json delete mode 100644 src/Customizations/SharedTagRenderings.ts diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 3941aaf99..1f5422256 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -226,6 +226,8 @@ - kindergarten_childcare - pharmacy - postoffices + - questions + - questions - shops - shower - sports_centre @@ -380,6 +382,8 @@ - climbing_gym - food - observation_tower + - questions + - questions - shops - ticket_validator @@ -432,6 +436,7 @@ - hackerspace - parking - picnic_table + - questions - railway_platforms - reception_desk - shops diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index ccbfca14a..aff72f926 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -10,529 +10,7 @@ The following items can be easily reused in your layers ## Table of contents 1. [Builtin questions](#builtin-questions) - + [questions](#questions) - + [images](#images) - + [mapillary](#mapillary) - + [export_as_gpx](#export_as_gpx) - + [export_as_geojson](#export_as_geojson) - + [wikipedia](#wikipedia) - + [reviews](#reviews) - + [minimap](#minimap) - + [phone](#phone) - + [osmlink](#osmlink) - + [email](#email) - + [website](#website) - + [wheelchair-access](#wheelchair-access) - + [dog-access](#dog-access) - + [description](#description) - + [opening_hours](#opening_hours) - + [opening_hours_24_7](#opening_hours_24_7) - + [opening_hours_by_appointment](#opening_hours_by_appointment) - + [service:electricity](#serviceelectricity) - + [payment-options](#payment-options) - + [payment-options-split](#payment-options-split) - + [payment-options-advanced](#payment-options-advanced) - + [denominations-coins](#denominations-coins) - + [denominations-notes](#denominations-notes) - + [all_tags](#all_tags) - + [just_created](#just_created) - + [multilevels](#multilevels) - + [level](#level) - + [smoking](#smoking) - + [induction-loop](#induction-loop) - + [internet](#internet) - + [internet-fee](#internet-fee) - + [internet-ssid](#internet-ssid) - + [luminous_or_lit](#luminous_or_lit) - - - - -### questions - - - -{questions()} - -*Read-only tagrendering* - - - -### images - - - -{image_carousel()}{image_upload()} - -*Read-only tagrendering* - - - -### mapillary - - - -{mapillary()} - -*Read-only tagrendering* - - - -### export_as_gpx - - - -{export_as_gpx()} - -*Read-only tagrendering* - - - -### export_as_geojson - - - -{export_as_geojson()} - -*Read-only tagrendering* - - - -### wikipedia - - - -{wikipedia():max-height:25rem} - -What is the corresponding Wikidata entity? - - - - - {wikipedia():max-height:25rem} - - No Wikipedia page has been linked yet - - - - -### reviews - - - -{reviews()} - -*Read-only tagrendering* - - - -### minimap - - - -{minimap(18, id): width:100%; height:8rem; border-radius:2rem; overflow: hidden; pointer-events: none;} - -*Read-only tagrendering* - - - -### phone - - - -{phone} - -What is the phone number of {title()}? - - - - - {contact:phone} - - - - -### osmlink - - - - - -*Read-only tagrendering* - - - - - Uploading... - - - - -### email - - - -{email} - -What is the email address of {title()}? - - - - - {contact:email} - - - - -### website - - - -{website} - -What is the website of {title()}? - - - - - {contact:website} - - - - -### wheelchair-access - - - -Is this place accessible with a wheelchair? - - - - - This place is specially adapted for wheelchair users - - This place is easily reachable with a wheelchair - - It is possible to reach this place in a wheelchair, but it is not easy - - This place is not reachable with a wheelchair - - - - -### dog-access - - - -Are dogs allowed in this business? - - - - - Dogs are allowed - - Dogs are not allowed - - Dogs are allowed, but they have to be leashed - - Dogs are allowed and can run around freely - - - - -### description - - - -{description} - -Is there still some relevant info that the previous questions did not cover? Feel free to add it here. - - - -### opening_hours - - - -

Opening hours

{opening_hours_table(opening_hours)} - -What are the opening hours of {title()}? - - - -### opening_hours_24_7 - - - -

Opening hours

{opening_hours_table(opening_hours)} - -What are the opening hours of {title()}? - - - - - 24/7 opened (including holidays) - - - - -### opening_hours_by_appointment - - - -

Opening hours

{opening_hours_table(opening_hours)} - -What are the opening hours of {title()}? - - - - - Only by appointment - - Only by appointment - - - - -### service:electricity - - - -Does this amenity have electrical outlets, available to customers when they are inside? - - - - - There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics - - There are a few domestic sockets available to customers seated indoors, where they can charge their electronics - - There are no sockets available indoors to customers, but charging might be possible if the staff is asked - - There are a no domestic sockets available to customers seated indoors - - - - -### payment-options - - - -Which methods of payment are accepted here? - - - - - Cash is accepted here - - Payment cards are accepted here - - Payment by QR-code is possible here - - - - -### payment-options-split - - - -Which methods of payment are accepted here? - - - - - Cash is accepted here - - Payment cards are accepted here - - Payment by QR-code is possible here - - Coins are accepted here - - Bank notes are accepted here - - Debit cards are accepted here - - Credit cards are accepted here - - - - -### payment-options-advanced - - - -Which methods of payment are accepted here? - - - - - Cash is accepted here - - Payment cards are accepted here - - Payment by QR-code is possible here - - Payment is done using a dedicated app - - Payment is done using a membership card - - - - -### denominations-coins - - - -What coins can you use to pay here? - - - - - 1 cent coins are accepted - - 2 cent coins are accepted - - 5 cent coins are accepted - - 10 cent coins are accepted - - 20 cent coins are accepted - - 50 cent coins are accepted - - 1 euro coins are accepted - - 2 euro coins are accepted - - - - -### denominations-notes - - - -what notes can you use to pay here? - - - - - 5 euro notes are accepted - - 10 euro notes are accepted - - 20 euro notes are accepted - - 50 euro notes are accepted - - 100 euro notes are accepted - - 200 euro notes are accepted - - 500 euro notes are accepted - - - - -### all_tags - - - -{all_tags()} - -*Read-only tagrendering* - - - -### just_created - - - -*Read-only tagrendering* - - - - - You just created this element! Thanks for sharing this info with the world and helping people worldwide. - - - - -### multilevels - - - -This elevator goes to floors {level} - -What levels does this elevator go to? - - - - - Located underground - - Located on the ground floor - - Located on the ground floor - - Located on the first floor - - Located on the first basement level - - - - -### level - - - -Located on the {level}th floor - -On what level is this feature located? - - - - - Located underground - - Located on the ground floor - - Located on the ground floor - - Located on the first floor - - Located on the first basement level - - - - -### smoking - - - -Is smoking allowed at {title()}? - - - - - Smoking is allowed - - Smoking is not allowed - - Smoking is allowed outside. - - - - -### induction-loop - - - -Does this place have an audio induction loop for people with reduced hearing? - - - - - This place has an audio induction loop - - This place does not have an audio induction loop - - - - -### internet - - - -Does this place offer internet access? - - - - - This place offers wireless internet access - - This place does not offer internet access - - This place offers internet access - - This place offers internet access via a terminal or computer - - This place offers wired internet access - - - - -### internet-fee - - - -Is there a fee for internet access? - - - - - There is a fee for the internet access at this place - - Internet access is free at this place - - Internet access is free at this place, for customers only - - - - -### internet-ssid - - - -The network name is {internet_access:ssid} - -What is the network name for the wireless internet access? - - - - - Telekom - - - - -### luminous_or_lit - - - -Is this object lit or does it emit light? - - - - - This object both emits light and is lighted by an external light source - - This object emits light - - This object is lit externally, e.g. by a spotlight or other lights - - This object does not emit light and is not lighted by externally -This document is autogenerated from [Customizations/SharedTagRenderings.ts](https://github.com/pietervdvn/MapComplete/blob/develop/Customizations/SharedTagRenderings.ts), [assets/tagRenderings/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/tagRenderings/questions.json) +This document is autogenerated from [src/Customizations/SharedTagRenderings.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Customizations/SharedTagRenderings.ts), [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json) diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md index 65cc1d4b1..4617eca58 100644 --- a/Docs/CalculatedTags.md +++ b/Docs/CalculatedTags.md @@ -26,6 +26,7 @@ + [_level](#_level) + [_referencing_ways](#_referencing_ways) + [_last_edit:passed_time](#_last_editpassed_time) + + [_currency](#_currency) + [distanceTo](#distanceto) + [overlapWith](#overlapwith) + [enclosingFeatures](#enclosingfeatures) @@ -223,6 +224,16 @@ This is a lazy metatag and is only calculated when needed +### _currency + + + +Adds the currency valid for the object, based on country or explicit tagging. Can be a single currency or a semicolon-separated list of currencies. Empty if no currency is found. + +This is a lazy metatag and is only calculated when needed + + + Calculating tags with Javascript ---------------------------------- @@ -351,4 +362,4 @@ If a 'unique tag key' is given, the tag with this key will only appear once (e.g 0. key -This document is autogenerated from [Logic/SimpleMetaTagger.ts](https://github.com/pietervdvn/MapComplete/blob/develop/Logic/SimpleMetaTagger.ts), [Logic/ExtraFunctions.ts](https://github.com/pietervdvn/MapComplete/blob/develop/Logic/ExtraFunctions.ts) +This document is autogenerated from [src/Logic/SimpleMetaTagger.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Logic/SimpleMetaTagger.ts), [src/Logic/ExtraFunctions.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Logic/ExtraFunctions.ts) diff --git a/Docs/Layers/advertising.md b/Docs/Layers/advertising.md index 749cd262a..f02dd38fa 100644 --- a/Docs/Layers/advertising.md +++ b/Docs/Layers/advertising.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -140,7 +140,7 @@ The question is *Does this advertisement cycle through multiple messages?* -### luminous_or_lit +### luminous_or_lit_advertising diff --git a/Docs/Layers/all_streets.md b/Docs/Layers/all_streets.md index a9815681d..0574b9395 100644 --- a/Docs/Layers/all_streets.md +++ b/Docs/Layers/all_streets.md @@ -135,7 +135,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/ambulancestation.md b/Docs/Layers/ambulancestation.md index 13cfe108e..2b3785fed 100644 --- a/Docs/Layers/ambulancestation.md +++ b/Docs/Layers/ambulancestation.md @@ -162,7 +162,7 @@ This is rendered with `The operator is a(n) {operator:type} entity.` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md index baa6b9689..6bb291c52 100644 --- a/Docs/Layers/artwork.md +++ b/Docs/Layers/artwork.md @@ -55,6 +55,14 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | [](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | [](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [bench](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbench) [](https://wiki.openstreetmap.org/wiki/Tag:amenity%3D) +[](https://taginfo.openstreetmap.org/keys/backrest#values) [backrest](https://wiki.openstreetmap.org/wiki/Key:backrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno) +[](https://taginfo.openstreetmap.org/keys/seats#values) [seats](https://wiki.openstreetmap.org/wiki/Key:seats) | [nat](../SpecialInputElements.md#nat) | +[](https://taginfo.openstreetmap.org/keys/material#values) [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [metal](https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal) [stone](https://wiki.openstreetmap.org/wiki/Tag:material%3Dstone) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) [steel](https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel) +[](https://taginfo.openstreetmap.org/keys/direction#values) [direction](https://wiki.openstreetmap.org/wiki/Key:direction) | [direction](../SpecialInputElements.md#direction) | +[](https://taginfo.openstreetmap.org/keys/colour#values) [colour](https://wiki.openstreetmap.org/wiki/Key:colour) | [color](../SpecialInputElements.md#color) | [brown](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown) [green](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen) [gray](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray) [white](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite) [red](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred) [black](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack) [blue](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue) [yellow](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow) +[](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D) +[](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | +[](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D) @@ -82,7 +90,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -231,6 +239,194 @@ The question is *Does this artwork serve as a bench?* +### bench-backrest + + + +The question is *Does this bench have a backrest?* + + + + + + - *This bench is two-sided and shares the backrest* corresponds with `backrest=yes&two_sided=yes` + - *Does have a backrest* corresponds with `backrest=yes` + - *Does not have a backrest* corresponds with `backrest=no` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-seats + + + +The question is *How many seats does this bench have?* + +This rendering asks information about the property [seats](https://wiki.openstreetmap.org/wiki/Key:seats) + +This is rendered with `{seats} seats` + + + + + + - *This bench does not have separated seats* corresponds with `seats:separated=no` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-material + + + +The question is *What is the bench (seating) made from?* + +This rendering asks information about the property [material](https://wiki.openstreetmap.org/wiki/Key:material) + +This is rendered with `Material: {material}` + + + + + + - *The seating is made from wood* corresponds with `material=wood` + - *The seating is made from metal* corresponds with `material=metal` + - *The seating is made from stone* corresponds with `material=stone` + - *The seating is made from concrete* corresponds with `material=concrete` + - *The seating is made from plastic* corresponds with `material=plastic` + - *The seating is made from steel* corresponds with `material=steel` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-direction + + + +The question is *In which direction are you looking when sitting on the bench?* + +This rendering asks information about the property [direction](https://wiki.openstreetmap.org/wiki/Key:direction) + +This is rendered with `When sitting on the bench, one looks towards {direction}°.` + + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-colour + + + +The question is *Which colour does this bench have?* + +This rendering asks information about the property [colour](https://wiki.openstreetmap.org/wiki/Key:colour) + +This is rendered with `Colour: {colour}` + + + + + + - *Colour: brown* corresponds with `colour=brown` + - *Colour: green* corresponds with `colour=green` + - *Colour: gray* corresponds with `colour=gray` + - *Colour: white* corresponds with `colour=white` + - *Colour: red* corresponds with `colour=red` + - *Colour: black* corresponds with `colour=black` + - *Colour: blue* corresponds with `colour=blue` + - *Colour: yellow* corresponds with `colour=yellow` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-survey:date + + + +The question is *When was this bench last surveyed?* + +This rendering asks information about the property [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) + +This is rendered with `This bench was last surveyed on {survey:date}` + + + + + + - *Surveyed today!* corresponds with `survey:date=` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-inscription + + + +The question is *Does this bench have an inscription?* + +This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) + +This is rendered with `This bench does have the following inscription:

{inscription}

` + + + + + + - *This bench does not have an inscription* corresponds with `not:inscription=yes` + - *This bench does (probably) not have an inscription* corresponds with `` + - This option cannot be chosen as answer + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + +### bench-memorial + + + +The question is *Does this bench act as memorial for someone or something?* + + + + + + - *This bench is a memorial for someone or something* corresponds with `historic=memorial` + - *This bench is a not a memorial for someone or something* corresponds with `not:historic=memorial` + + +This tagrendering is only visible in the popup if the following condition is met: `amenity=bench` + +This tagrendering has labels `bench-questions` + + + ### leftover-questions diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md index 67d3780c0..26184c53d 100644 --- a/Docs/Layers/atm.md +++ b/Docs/Layers/atm.md @@ -81,7 +81,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md index 9fa4ce16a..c4bfd1c46 100644 --- a/Docs/Layers/barrier.md +++ b/Docs/Layers/barrier.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md index 0c79713d1..54686f496 100644 --- a/Docs/Layers/bench.md +++ b/Docs/Layers/bench.md @@ -5,7 +5,7 @@ - + A bench is a wooden, metal, stone, … surface where a human can sit. This layers visualises them and asks a few questions about them. @@ -58,6 +58,11 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | [](https://taginfo.openstreetmap.org/keys/tourism#values) [tourism](https://wiki.openstreetmap.org/wiki/Key:tourism) | Multiple choice | [artwork](https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dartwork) [](https://wiki.openstreetmap.org/wiki/Tag:tourism%3D) [](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D) +[](https://taginfo.openstreetmap.org/keys/artwork_type#values) [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) | [string](../SpecialInputElements.md#string) | [architecture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Darchitecture) [mural](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dmural) [painting](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dpainting) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dsculpture) [statue](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstatue) [bust](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dbust) [stone](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstone) [installation](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dinstallation) [graffiti](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dgraffiti) [relief](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief) [azulejo](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo) [tilework](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework) [woodcarving](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dwoodcarving) +[](https://taginfo.openstreetmap.org/keys/artist:wikidata#values) [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | +[](https://taginfo.openstreetmap.org/keys/artist_name#values) [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | +[](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | @@ -85,7 +90,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -283,6 +288,113 @@ This tagrendering has labels `bench-questions` +### artwork-artwork_type + + + +The question is *What is the type of this artwork?* + +This rendering asks information about the property [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) + +This is rendered with `This is a {artwork_type}` + + + + + + - *Architecture* corresponds with `artwork_type=architecture` + - *Mural* corresponds with `artwork_type=mural` + - *Painting* corresponds with `artwork_type=painting` + - *Sculpture* corresponds with `artwork_type=sculpture` + - *Statue* corresponds with `artwork_type=statue` + - *Bust* corresponds with `artwork_type=bust` + - *Stone* corresponds with `artwork_type=stone` + - *Installation* corresponds with `artwork_type=installation` + - *Graffiti* corresponds with `artwork_type=graffiti` + - *Relief* corresponds with `artwork_type=relief` + - *Azulejo (Spanish decorative tilework)* corresponds with `artwork_type=azulejo` + - *Tilework* corresponds with `artwork_type=tilework` + - *Woodcarving* corresponds with `artwork_type=woodcarving` + + +This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork` + +This tagrendering has labels `artwork-question` + + + +### artwork-artist-wikidata + + + +The question is *Who made this artwork?* + +This rendering asks information about the property [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) + +This is rendered with `This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}` + + + +This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork` + +This tagrendering has labels `artwork-question` + + + +### artwork-artist_name + + + +The question is *Which artist created this?* + +This rendering asks information about the property [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) + +This is rendered with `Created by {artist_name}` + + + +This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork` + +This tagrendering has labels `artwork-question` + + + +### artwork-website + + + +The question is *Is there a website with more information about this artwork?* + +This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) + +This is rendered with `More information on this website` + + + +This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork` + +This tagrendering has labels `artwork-question` + + + +### artwork_subject + + + +The question is *What does this artwork depict?* + +This rendering asks information about the property [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) + +This is rendered with `This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}` + + + +This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork` + +This tagrendering has labels `artwork-question` + + + ### leftover-questions diff --git a/Docs/Layers/bench_at_pt.md b/Docs/Layers/bench_at_pt.md index 77fc17217..0e37a9150 100644 --- a/Docs/Layers/bench_at_pt.md +++ b/Docs/Layers/bench_at_pt.md @@ -76,7 +76,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md index fff4eecf6..7126f9881 100644 --- a/Docs/Layers/bicycle_library.md +++ b/Docs/Layers/bicycle_library.md @@ -83,7 +83,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md index c67a14097..0d623ef0a 100644 --- a/Docs/Layers/bicycle_rental.md +++ b/Docs/Layers/bicycle_rental.md @@ -87,7 +87,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md index e8fabc44c..2033dfb86 100644 --- a/Docs/Layers/bicycle_rental_non_docking.md +++ b/Docs/Layers/bicycle_rental_non_docking.md @@ -85,7 +85,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bicycle_tube_vending_machine.md b/Docs/Layers/bicycle_tube_vending_machine.md index 1094b34c2..ad88914a5 100644 --- a/Docs/Layers/bicycle_tube_vending_machine.md +++ b/Docs/Layers/bicycle_tube_vending_machine.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md index 0ff7478ba..d2a1bf983 100644 --- a/Docs/Layers/bike_cafe.md +++ b/Docs/Layers/bike_cafe.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bike_cleaning.md b/Docs/Layers/bike_cleaning.md index 1edfd3cb4..225c369a8 100644 --- a/Docs/Layers/bike_cleaning.md +++ b/Docs/Layers/bike_cleaning.md @@ -76,7 +76,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md index c310ae641..495494460 100644 --- a/Docs/Layers/bike_parking.md +++ b/Docs/Layers/bike_parking.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md index 25781d313..af95fe4e2 100644 --- a/Docs/Layers/bike_repair_station.md +++ b/Docs/Layers/bike_repair_station.md @@ -87,7 +87,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 40f7a6a31..b2ce278d6 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -57,10 +57,19 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/service:bicycle:retail#values) [service:bicycle:retail](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:retail) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dno) [](https://taginfo.openstreetmap.org/keys/service:bicycle:repair#values) [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand) [](https://taginfo.openstreetmap.org/keys/service:bicycle:rental#values) [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno) +[](https://taginfo.openstreetmap.org/keys/rental#values) [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet) +[](https://taginfo.openstreetmap.org/keys/capacity:city_bike#values) [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:ebike#values) [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:kid_bike#values) [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:bmx#values) [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:mtb#values) [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:bicycle_pannier#values) [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/capacity:tandem_bicycle#values) [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) | [](https://taginfo.openstreetmap.org/keys/service:bicycle:second_hand#values) [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly) [](https://taginfo.openstreetmap.org/keys/service:bicycle:pump#values) [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate) [](https://taginfo.openstreetmap.org/keys/service:bicycle:diy#values) [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold) [](https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning#values) [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno) +[](https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning:charge#values) [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) | [](https://taginfo.openstreetmap.org/keys/description#values) [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | @@ -89,7 +98,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -272,6 +281,162 @@ The question is *Does this shop rent out bikes?* +### bicycle-types + + + +The question is *What kind of bicycles and accessories are rented here?* + +This rendering asks information about the property [rental](https://wiki.openstreetmap.org/wiki/Key:rental) + +This is rendered with `{rental} is rented here` + + + + + + - *Normal city bikes can be rented here* corresponds with `rental=city_bike` + - *Electrical bikes can be rented here* corresponds with `rental=ebike` + - *BMX bikes can be rented here* corresponds with `rental=bmx` + - *Mountainbikes can be rented here* corresponds with `rental=mtb` + - *Bikes for children can be rented here* corresponds with `rental=kid_bike` + - *Tandem bicycles can be rented here* corresponds with `rental=tandem` + - *Race bicycles can be rented here* corresponds with `rental=racebike` + - *Bike helmets can be rented here* corresponds with `rental=bike_helmet` + + +This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-city_bike + + + +The question is *How many city bikes can be rented here?* + +This rendering asks information about the property [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) + +This is rendered with `{capacity:city_bike} city bikes can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-ebike + + + +The question is *How many electrical bikes can be rented here?* + +This rendering asks information about the property [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) + +This is rendered with `{capacity:ebike} electrical bikes can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-kid_bike + + + +The question is *How many bikes for children can be rented here?* + +This rendering asks information about the property [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) + +This is rendered with `{capacity:kid_bike} bikes for children can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-bmx + + + +The question is *How many BMX bikes can be rented here?* + +This rendering asks information about the property [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) + +This is rendered with `{capacity:bmx} BMX bikes can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-mtb + + + +The question is *How many mountainbikes can be rented here?* + +This rendering asks information about the property [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) + +This is rendered with `{capacity:mtb} mountainbikes can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-bicycle_pannier + + + +The question is *How many bicycle panniers can be rented here?* + +This rendering asks information about the property [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) + +This is rendered with `{capacity:bicycle_pannier} bicycle panniers can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + +### rental-capacity-tandem_bicycle + + + +The question is *How many tandem can be rented here?* + +This rendering asks information about the property [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) + +This is rendered with `{capacity:tandem_bicycle} tandem can be rented here` + + + +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes` + +This tagrendering has labels `bicycle_rental` + + + ### bike_repair_second-hand-bikes @@ -340,12 +505,23 @@ The question is *Are bicycles washed here?* -### bikecleaningbikecleaningservicebicyclecleaningcharge +### bike_cleaning-service:bicycle:cleaning:charge -This tagrendering has no question and is thus read-only +The question is *How much does it cost to use the cleaning service?* +This rendering asks information about the property [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) + +This is rendered with `Using the cleaning service costs {service:bicycle:cleaning:charge}` + + + + + + - *The cleaning service is free to use* corresponds with `service:bicycle:cleaning:fee=no` + - *Free to use* corresponds with `service:bicycle:cleaning:fee=yes` + - This option cannot be chosen as answer diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md index 8a66060f8..eee0b9787 100644 --- a/Docs/Layers/bike_themed_object.md +++ b/Docs/Layers/bike_themed_object.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/binocular.md b/Docs/Layers/binocular.md index ef2953193..398e89083 100644 --- a/Docs/Layers/binocular.md +++ b/Docs/Layers/binocular.md @@ -76,7 +76,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/birdhide.md b/Docs/Layers/birdhide.md index 5f6cd18ef..3abb877d6 100644 --- a/Docs/Layers/birdhide.md +++ b/Docs/Layers/birdhide.md @@ -77,7 +77,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index a5b485aac..36205df91 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -89,7 +89,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/car_rental.md b/Docs/Layers/car_rental.md index 5db6a8502..57924f0e1 100644 --- a/Docs/Layers/car_rental.md +++ b/Docs/Layers/car_rental.md @@ -67,7 +67,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/caravansites.md b/Docs/Layers/caravansites.md index dcbbc0970..c4ac4980d 100644 --- a/Docs/Layers/caravansites.md +++ b/Docs/Layers/caravansites.md @@ -86,7 +86,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -271,7 +271,7 @@ This is rendered with `More details about this place: {description}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md index 7a96658b1..3ecc1c768 100644 --- a/Docs/Layers/charging_station.md +++ b/Docs/Layers/charging_station.md @@ -155,7 +155,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -1697,7 +1697,7 @@ This tagrendering has labels `technical` -### opening_hours_24_7 +### OH @@ -1752,7 +1752,7 @@ This tagrendering is only visible in the popup if the following condition is met -### payment-options-advanced +### payment-options @@ -2013,7 +2013,7 @@ The question is *Does one have to pay a parking fee while charging?* -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md index 51609f548..a2fc01122 100644 --- a/Docs/Layers/charging_station_ebikes.md +++ b/Docs/Layers/charging_station_ebikes.md @@ -153,7 +153,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -1695,7 +1695,7 @@ This tagrendering has labels `technical` -### opening_hours_24_7 +### OH @@ -1750,7 +1750,7 @@ This tagrendering is only visible in the popup if the following condition is met -### payment-options-advanced +### payment-options @@ -2011,7 +2011,7 @@ The question is *Does one have to pay a parking fee while charging?* -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md index 3d7ebc5d7..f69cd5aa5 100644 --- a/Docs/Layers/climbing_area.md +++ b/Docs/Layers/climbing_area.md @@ -51,6 +51,9 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:name%3D) [](https://taginfo.openstreetmap.org/keys/climbing#values) [climbing](https://wiki.openstreetmap.org/wiki/Key:climbing) | Multiple choice | [boulder](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Dboulder) [crag](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Dcrag) [area](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Darea) [](https://taginfo.openstreetmap.org/keys/rock#values) [rock](https://wiki.openstreetmap.org/wiki/Key:rock) | [string](../SpecialInputElements.md#string) | [limestone](https://wiki.openstreetmap.org/wiki/Tag:rock%3Dlimestone) +[](https://taginfo.openstreetmap.org/keys/url#values) [url](https://wiki.openstreetmap.org/wiki/Key:url) | [url](../SpecialInputElements.md#url) | +[](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:charge%3D) +[](https://taginfo.openstreetmap.org/keys/climbing:boulder#values) [climbing:boulder](https://wiki.openstreetmap.org/wiki/Key:climbing:boulder) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited) @@ -78,7 +81,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -185,6 +188,61 @@ This tagrendering is only visible in the popup if the following condition is met +### website + + + +The question is *Is there a (unofficial) website with more informations (e.g. topos)?* + +This rendering asks information about the property [url](https://wiki.openstreetmap.org/wiki/Key:url) + +This is rendered with `{url}` + + + +This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing` + + + +### fee + + + +The question is *Is a fee required to climb here?* + +This rendering asks information about the property [charge](https://wiki.openstreetmap.org/wiki/Key:charge) + +This is rendered with `A fee of {charge} should be paid for climbing here` + + + + + + - *Climbing here is free of charge* corresponds with `fee=no` + - *Paying a fee is required to climb here* corresponds with `fee=yes` + + + + +### bouldering + + + +The question is *Is bouldering possible here?* + + + + + + - *Bouldering is possible here* corresponds with `climbing:boulder=yes` + - *Bouldering is not possible here* corresponds with `climbing:boulder=no` + - *Bouldering is possible, although there are only a few problems* corresponds with `climbing:boulder=limited` + - *There are {climbing:boulder} boulder problems* corresponds with `climbing:boulder~.+` + - This option cannot be chosen as answer + + + + ### leftover-questions diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md index b2d3b59b6..d6e734a51 100644 --- a/Docs/Layers/climbing_gym.md +++ b/Docs/Layers/climbing_gym.md @@ -51,10 +51,18 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | +[](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:charge%3D) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/service:climbing_shoes:rental#values) [service:climbing_shoes:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dno) [](https://taginfo.openstreetmap.org/keys/service:climbing_harness:rental#values) [service:climbing_harness:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dno) [](https://taginfo.openstreetmap.org/keys/service:climbing_rope:rental#values) [service:climbing_rope:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_rope:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dno) +[](https://taginfo.openstreetmap.org/keys/climbing:boulder#values) [climbing:boulder](https://wiki.openstreetmap.org/wiki/Key:climbing:boulder) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited) +[](https://taginfo.openstreetmap.org/keys/climbing:sport#values) [climbing:sport](https://wiki.openstreetmap.org/wiki/Key:climbing:sport) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dno) +[](https://taginfo.openstreetmap.org/keys/climbing:toprope#values) [climbing:toprope](https://wiki.openstreetmap.org/wiki/Key:climbing:toprope) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dno) +[](https://taginfo.openstreetmap.org/keys/climbing:length#values) [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) | [pfloat](../SpecialInputElements.md#pfloat) | +[](https://taginfo.openstreetmap.org/keys/climbing:grade:french:min#values) [climbing:grade:french:min](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:min) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/climbing:grade:french:max#values) [climbing:grade:french:max](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:max) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/climbing:bolts:max#values) [climbing:bolts:max](https://wiki.openstreetmap.org/wiki/Key:climbing:bolts:max) | [pnat](../SpecialInputElements.md#pnat) | [](https://taginfo.openstreetmap.org/keys/climbing:speed#values) [climbing:speed](https://wiki.openstreetmap.org/wiki/Key:climbing:speed) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dno) [](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) @@ -86,7 +94,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -174,6 +182,26 @@ This tagrendering has labels `contact` +### fee + + + +The question is *Is a fee required to climb here?* + +This rendering asks information about the property [charge](https://wiki.openstreetmap.org/wiki/Key:charge) + +This is rendered with `A fee of {charge} should be paid for climbing here` + + + + + + - *Climbing here is free of charge* corresponds with `fee=no` + - *Paying a fee is required to climb here* corresponds with `fee=yes` + + + + ### payment-options @@ -285,51 +313,114 @@ The question is *Can one rent a climbing rope here?* -### climbingbouldering +### bouldering -This tagrendering has no question and is thus read-only +The question is *Is bouldering possible here?* -### climbingsportclimbing + - *Bouldering is possible here* corresponds with `climbing:boulder=yes` + - *Bouldering is not possible here* corresponds with `climbing:boulder=no` + - *Bouldering is possible, although there are only a few problems* corresponds with `climbing:boulder=limited` + - *There are {climbing:boulder} boulder problems* corresponds with `climbing:boulder~.+` + - This option cannot be chosen as answer -This tagrendering has no question and is thus read-only + +### sportclimbing + + + +The question is *Is sport climbing possible here on fixed anchors?* -### climbingtoprope + - *Sport climbing is possible here* corresponds with `climbing:sport=yes` + - *Sport climbing is not possible here* corresponds with `climbing:sport=no` + - *There are {climbing:sport} sport climbing routes* corresponds with `climbing:sport~.+` + - This option cannot be chosen as answer -This tagrendering has no question and is thus read-only + +### toprope + + + +The question is *Is toprope climbing possible here?* -### climbingmindifficulty + - *Toprope climbing is possible here* corresponds with `climbing:toprope=yes` + - *Toprope climbing is not possible here* corresponds with `climbing:toprope=no` + - *There are {climbing:toprope} toprope routes* corresponds with `climbing:toprope~.+` + - This option cannot be chosen as answer -This tagrendering has no question and is thus read-only + +### average_length + + + +The question is *What is the (average) length of the routes in meters?* + +This rendering asks information about the property [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) + +This is rendered with `The routes are {canonical(climbing:length)} long on average` -### climbingmaxdifficulty +### min_difficulty -This tagrendering has no question and is thus read-only +The question is *What is the grade of the easiest route here, according to the french classification system?* + +This rendering asks information about the property [climbing:grade:french:min](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:min) + +This is rendered with `The lowest grade is {climbing:grade:french:min} according to the french/belgian system` + + + + + +### max_difficulty + + + +The question is *What is the highest grade route here, according to the french classification system?* + +This rendering asks information about the property [climbing:grade:french:max](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:max) + +This is rendered with `The highest grade is {climbing:grade:french:max} according to the french/belgian system` + + + +This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing` + + + +### max_bolts + + + +The question is *How many bolts do routes in {title()} have at most?* + +This rendering asks information about the property [climbing:bolts:max](https://wiki.openstreetmap.org/wiki/Key:climbing:bolts:max) + +This is rendered with `The sport climbing routes here have at most {climbing:bolts:max} bolts.
This is without relays and indicates how much quickdraws a climber needs
` diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md index 12e079584..a653ad7dc 100644 --- a/Docs/Layers/climbing_route.md +++ b/Docs/Layers/climbing_route.md @@ -81,7 +81,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/clock.md b/Docs/Layers/clock.md index c3ffafc41..7a552cbf7 100644 --- a/Docs/Layers/clock.md +++ b/Docs/Layers/clock.md @@ -83,7 +83,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/crossings.md b/Docs/Layers/crossings.md index 70fb4334a..0013d6e9b 100644 --- a/Docs/Layers/crossings.md +++ b/Docs/Layers/crossings.md @@ -90,7 +90,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/cultural_places_without_etymology.md b/Docs/Layers/cultural_places_without_etymology.md index a07626850..da20f20d7 100644 --- a/Docs/Layers/cultural_places_without_etymology.md +++ b/Docs/Layers/cultural_places_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md index fab162e0e..18191b378 100644 --- a/Docs/Layers/defibrillator.md +++ b/Docs/Layers/defibrillator.md @@ -90,7 +90,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md index 47da7add6..734a37cd6 100644 --- a/Docs/Layers/dentist.md +++ b/Docs/Layers/dentist.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md index d230498d7..db6b402f8 100644 --- a/Docs/Layers/doctors.md +++ b/Docs/Layers/doctors.md @@ -81,7 +81,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md index 436541f5d..bcbfe1771 100644 --- a/Docs/Layers/dogfoodb.md +++ b/Docs/Layers/dogfoodb.md @@ -99,7 +99,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/dogpark.md b/Docs/Layers/dogpark.md index 030baa339..88709a12c 100644 --- a/Docs/Layers/dogpark.md +++ b/Docs/Layers/dogpark.md @@ -145,7 +145,7 @@ This tagrendering has no question and is thus read-only -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md index 6207656e5..ac6f186a6 100644 --- a/Docs/Layers/dogshop.md +++ b/Docs/Layers/dogshop.md @@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | @@ -83,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -105,6 +106,184 @@ This is rendered with `This shop is called {name}` +### shop_types + + + +The question is *What kind of shop is this?* + +This rendering asks information about the property [shop](https://wiki.openstreetmap.org/wiki/Key:shop) + +This is rendered with `This is a {shop}` + + + + + + - *Farm Supply Shop* corresponds with `shop=agrarian` + - *Liquor Store* corresponds with `shop=alcohol` + - *Anime / Manga Shop* corresponds with `shop=anime` + - *Antiques Shop* corresponds with `shop=antiques` + - *Appliance Store* corresponds with `shop=appliance` + - *Art Store* corresponds with `shop=art` + - *Baby Goods Store* corresponds with `shop=baby_goods` + - *Bag/Luggage Store* corresponds with `shop=bag` + - *Bakery* corresponds with `shop=bakery` + - *Bathroom Furnishing Store* corresponds with `shop=bathroom_furnishing` + - *Beauty Shop* corresponds with `shop=beauty` + - *Bedding/Mattress Store* corresponds with `shop=bed` + - *Beverage Store* corresponds with `shop=beverages` + - *Bicycle Shop* corresponds with `shop=bicycle` + - *Boat Store* corresponds with `shop=boat` + - *Bookmaker* corresponds with `shop=bookmaker` + - *Book Store* corresponds with `shop=books` + - *Brewing Supply Store* corresponds with `shop=brewing_supplies` + - *Butcher* corresponds with `shop=butcher` + - *Camera Equipment Store* corresponds with `shop=camera` + - *Candle Shop* corresponds with `shop=candles` + - *Cannabis Shop* corresponds with `shop=cannabis` + - *Car Dealership* corresponds with `shop=car` + - *Car Parts Store* corresponds with `shop=car_parts` + - *Car Repair Shop* corresponds with `shop=car_repair` + - *RV Dealership* corresponds with `shop=caravan` + - *Carpet Store* corresponds with `shop=carpet` + - *Catalog Shop* corresponds with `shop=catalogue` + - *Charity Store* corresponds with `shop=charity` + - *Cheese Store* corresponds with `shop=cheese` + - *Drugstore* corresponds with `shop=chemist` + - *Chocolate Store* corresponds with `shop=chocolate` + - *Clothing Store* corresponds with `shop=clothes` + - *Coffee Store* corresponds with `shop=coffee` + - *Collectibles Shop* corresponds with `shop=collector` + - *Computer Store* corresponds with `shop=computer` + - *Candy Store* corresponds with `shop=confectionery` + - *Convenience Store* corresponds with `shop=convenience` + - *Copy Store* corresponds with `shop=copyshop` + - *Cosmetics Store* corresponds with `shop=cosmetics` + - *Country Store* corresponds with `shop=country_store` + - *Arts & Crafts Store* corresponds with `shop=craft` + - *Curtain Store* corresponds with `shop=curtain` + - *Dairy Store* corresponds with `shop=dairy` + - *Deli* corresponds with `shop=deli` + - *Department Store* corresponds with `shop=department_store` + - *DIY Store* corresponds with `shop=doityourself` + - *Door Shop* corresponds with `shop=doors` + - *Dry Cleaner* corresponds with `shop=dry_cleaning` + - *E-Cigarette Shop* corresponds with `shop=e-cigarette` + - *Electrical Equipment Store* corresponds with `shop=electrical` + - *Electronics Store* corresponds with `shop=electronics` + - *Erotic Store* corresponds with `shop=erotic` + - *Fabric Store* corresponds with `shop=fabric` + - *Produce Stand* corresponds with `shop=farm` + - *Fashion Accessories Store* corresponds with `shop=fashion_accessories` + - *Fireplace Store* corresponds with `shop=fireplace` + - *Fishing Shop* corresponds with `shop=fishing` + - *Flooring Supply Shop* corresponds with `shop=flooring` + - *Florist* corresponds with `shop=florist` + - *Framing Shop* corresponds with `shop=frame` + - *Frozen Food Store* corresponds with `shop=frozen_food` + - *Fuel Shop* corresponds with `shop=fuel` + - *Funeral Home* corresponds with `shop=funeral_directors` + - *Furniture Store* corresponds with `shop=furniture` + - *Tabletop Game Store* corresponds with `shop=games` + - *Garden Center* corresponds with `shop=garden_centre` + - *Bottled Gas Shop* corresponds with `shop=gas` + - *General Store* corresponds with `shop=general` + - *Gift Shop* corresponds with `shop=gift` + - *Greengrocer* corresponds with `shop=greengrocer` + - *Hairdresser* corresponds with `shop=hairdresser` + - *Hairdresser Supply Store* corresponds with `shop=hairdresser_supply` + - *Hardware Store* corresponds with `shop=hardware` + - *Health Food Shop* corresponds with `shop=health_food` + - *Hearing Aids Store* corresponds with `shop=hearing_aids` + - *Herbalist* corresponds with `shop=herbalist` + - *Hifi Store* corresponds with `shop=hifi` + - *Hobby Shop* corresponds with `shop=hobby` + - *Household Linen Shop* corresponds with `shop=household_linen` + - *Houseware Store* corresponds with `shop=houseware` + - *Hunting Shop* corresponds with `shop=hunting` + - *Interior Decoration Store* corresponds with `shop=interior_decoration` + - *Jewelry Store* corresponds with `shop=jewelry` + - *Kiosk* corresponds with `shop=kiosk` + - *Kitchen Design Store* corresponds with `shop=kitchen` + - *Laundry* corresponds with `shop=laundry` + - *Leather Store* corresponds with `shop=leather` + - *Lighting Store* corresponds with `shop=lighting` + - *Locksmith* corresponds with `shop=locksmith` + - *Lottery Shop* corresponds with `shop=lottery` + - *Mall* corresponds with `shop=mall` + - *Massage Shop* corresponds with `shop=massage` + - *Medical Supply Store* corresponds with `shop=medical_supply` + - *Military Surplus Store* corresponds with `shop=military_surplus` + - *Mobile Phone Store* corresponds with `shop=mobile_phone` + - *Model Shop* corresponds with `shop=model` + - *Money Lender* corresponds with `shop=money_lender` + - *Motorcycle Dealership* corresponds with `shop=motorcycle` + - *Motorcycle Repair Shop* corresponds with `shop=motorcycle_repair` + - *Music Store* corresponds with `shop=music` + - *Musical Instrument Store* corresponds with `shop=musical_instrument` + - *Newspaper/Magazine Shop* corresponds with `shop=newsagent` + - *Nutrition Supplements Store* corresponds with `shop=nutrition_supplements` + - *Optician* corresponds with `shop=optician` + - *Outdoors Store* corresponds with `shop=outdoor` + - *Online Retailer Outpost* corresponds with `shop=outpost` + - *Paint Store* corresponds with `shop=paint` + - *Party Supply Store* corresponds with `shop=party` + - *Pastry Shop* corresponds with `shop=pastry` + - *Pawn Shop* corresponds with `shop=pawnbroker` + - *Perfume Store* corresponds with `shop=perfumery` + - *Pet Store* corresponds with `shop=pet` + - *Pet Grooming Store* corresponds with `shop=pet_grooming` + - *Photography Store* corresponds with `shop=photo` + - *Pottery Store* corresponds with `shop=pottery` + - *Printer Ink Store* corresponds with `shop=printer_ink` + - *Psychic* corresponds with `shop=psychic` + - *Fireworks Store* corresponds with `shop=pyrotechnics` + - *Radio/Electronic Component Store* corresponds with `shop=radiotechnics` + - *Religious Store* corresponds with `shop=religion` + - *Rental Shop* corresponds with `shop=rental` + - *Repair Shop* corresponds with `shop=repair` + - *Scuba Diving Shop* corresponds with `shop=scuba_diving` + - *Seafood Shop* corresponds with `shop=seafood` + - *Consignment/Thrift Store* corresponds with `shop=second_hand` + - *Sewing Supply Shop* corresponds with `shop=sewing` + - *Shoe Repair Shop* corresponds with `shop=shoe_repair` + - *Shoe Store* corresponds with `shop=shoes` + - *Spice Shop* corresponds with `shop=spices` + - *Sporting Goods Store* corresponds with `shop=sports` + - *Stationery Store* corresponds with `shop=stationery` + - *Storage Rental* corresponds with `shop=storage_rental` + - *Supermarket* corresponds with `shop=supermarket` + - *Pool Supply Store* corresponds with `shop=swimming_pool` + - *Tailor* corresponds with `shop=tailor` + - *Tattoo Parlor* corresponds with `shop=tattoo` + - *Tea Store* corresponds with `shop=tea` + - *Telecom Retail Store* corresponds with `shop=telecommunication` + - *Ticket Seller* corresponds with `shop=ticket` + - *Tile Shop* corresponds with `shop=tiles` + - *Tobacco Shop* corresponds with `shop=tobacco` + - *Tool Rental* corresponds with `shop=tool_hire` + - *Toy Store* corresponds with `shop=toys` + - *Trade Shop* corresponds with `shop=trade` + - *Travel Agency* corresponds with `shop=travel_agency` + - *Trophy Shop* corresponds with `shop=trophy` + - *Tire Store* corresponds with `shop=tyres` + - *Vacuum Cleaner Store* corresponds with `shop=vacuum_cleaner` + - *Variety Store* corresponds with `shop=variety_store` + - *Video Store* corresponds with `shop=video` + - *Video Game Store* corresponds with `shop=video_games` + - *Watches Shop* corresponds with `shop=watches` + - *Drinking Water Shop* corresponds with `shop=water` + - *Watersport/Swim Shop* corresponds with `shop=water_sports` + - *Weapon Shop* corresponds with `shop=weapons` + - *Wholesale Store* corresponds with `shop=wholesale` + - *Wig Shop* corresponds with `shop=wigs` + - *Window Blind Store* corresponds with `shop=window_blind` + - *Wine Shop* corresponds with `shop=wine` + + + + ### opening_hours @@ -339,7 +518,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md index a85ce7bf0..d6b3af4c6 100644 --- a/Docs/Layers/drinking_water.md +++ b/Docs/Layers/drinking_water.md @@ -80,7 +80,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/dumpstations.md b/Docs/Layers/dumpstations.md index 806216a7d..8b200a302 100644 --- a/Docs/Layers/dumpstations.md +++ b/Docs/Layers/dumpstations.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/education_institutions_without_etymology.md b/Docs/Layers/education_institutions_without_etymology.md index b4ecfc82c..53b366d0d 100644 --- a/Docs/Layers/education_institutions_without_etymology.md +++ b/Docs/Layers/education_institutions_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/elevator.md b/Docs/Layers/elevator.md index c57ea45c3..ae32eb488 100644 --- a/Docs/Layers/elevator.md +++ b/Docs/Layers/elevator.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/elongated_coin.md b/Docs/Layers/elongated_coin.md new file mode 100644 index 000000000..daa3c03f6 --- /dev/null +++ b/Docs/Layers/elongated_coin.md @@ -0,0 +1,320 @@ +[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) + + elongated_coin +================ + + + + + +Layer showing penny presses. + + + + + + + - This layer is shown at zoomlevel **0** and higher + + + + +#### Themes using this layer + + + + + + - [elongated_coin](https://mapcomplete.osm.be/elongated_coin) + + +This is a special layer - data is not sourced from OpenStreetMap + + + + Supported attributes +---------------------- + + + +Warning: + +this quick overview is incomplete + + + +attribute | type | values which are supported by this layer +----------- | ------ | ------------------------------------------ +[](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | +[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) +[](https://taginfo.openstreetmap.org/keys/coin:design_count#values) [coin:design_count](https://wiki.openstreetmap.org/wiki/Key:coin:design_count) | [pnat](../SpecialInputElements.md#pnat) | [1](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D1) [2](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D2) [3](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D3) [4](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D4) +[](https://taginfo.openstreetmap.org/keys/coin:type#values) [coin:type](https://wiki.openstreetmap.org/wiki/Key:coin:type) | [string](../SpecialInputElements.md#string) | [2cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D2cent) [5cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D5cent) [10cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D10cent) [25cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D25cent) [50cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D50cent) +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | +[](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D2 EUR) +[](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) +[](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) +[](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) + + + + +### just_created + + + +This element shows a 'thank you' that the contributor has recently created this element + +This tagrendering has no question and is thus read-only + + + + + + - *You just created this element! Thanks for sharing this info with the world and helping people worldwide.* corresponds with `id~.+` + + +This tagrendering is only visible in the popup if the following condition is met: `_backend~.+&_last_edit:passed_time<300&|_version_number=1` + + + +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images + +This tagrendering has no question and is thus read-only + + + + + +### opening_hours_24_7 + + + +The question is *What are the opening hours of {title()}?* + +This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) + +This is rendered with `

Opening hours

{opening_hours_table(opening_hours)}` + + + + + + - *24/7 opened (including holidays)* corresponds with `opening_hours=24/7` + + + + +### designs + + + +The question is *How many designs are available?* + +This rendering asks information about the property [coin:design_count](https://wiki.openstreetmap.org/wiki/Key:coin:design_count) + +This is rendered with `This penny press has {coin:design_count} designs available.` + + + + + + - *This penny press has one design available.* corresponds with `coin:design_count=1` + - *This penny press has two designs available.* corresponds with `coin:design_count=2` + - *This penny press has three designs available.* corresponds with `coin:design_count=3` + - *This penny press has four designs available.* corresponds with `coin:design_count=4` + + + + +### coin + + + +The question is *What coin is used for pressing?* + +This rendering asks information about the property [coin:type](https://wiki.openstreetmap.org/wiki/Key:coin:type) + +This is rendered with `This penny press uses a {coin:type} coin for pressing.` + + + + + + - *This penny press uses a 2 cent coin for pressing.* corresponds with `coin:type=2cent` + - *This penny press uses a 5 cent coin for pressing.* corresponds with `coin:type=5cent` + - *This penny press uses a 10 cent coin for pressing.* corresponds with `coin:type=10cent` + - *This penny press uses a 25 cent coin for pressing.* corresponds with `coin:type=25cent` + - *This penny press uses a 50 cent coin for pressing.* corresponds with `coin:type=50cent` + + + + +### website + + + +The question is *What is the website of {title()}?* + +This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) + +This is rendered with `{website}` + + + + + + - *{contact:website}* corresponds with `contact:website~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + +### charge + + + +The question is *How much does it cost to press a penny?* + +This rendering asks information about the property [charge](https://wiki.openstreetmap.org/wiki/Key:charge) + +This is rendered with `It costs {charge} to press a penny.` + + + + + + - *It costs 1 euro to press a penny.* corresponds with `charge=1 EUR` + - *It costs 2 euros to press a penny.* corresponds with `charge=2 EUR` + + + + +### denominations-coins + + + +The question is *What coins can you use to pay here?* + + + + + + - *1 cent coins are accepted* corresponds with `payment:coins:denominations=0.01 EUR` + - *2 cent coins are accepted* corresponds with `payment:coins:denominations=0.02 EUR` + - *5 cent coins are accepted* corresponds with `payment:coins:denominations=0.05 EUR` + - *10 cent coins are accepted* corresponds with `payment:coins:denominations=0.10 EUR` + - *20 cent coins are accepted* corresponds with `payment:coins:denominations=0.20 EUR` + - *50 cent coins are accepted* corresponds with `payment:coins:denominations=0.50 EUR` + - *1 euro coins are accepted* corresponds with `payment:coins:denominations=1 EUR` + - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR` + + + +### indoor + + + +The question is *Is the penny press indoors?* + + + + + + - *This penny press is located indoors.* corresponds with `indoor=yes` + - *This penny press is located outdoors.* corresponds with `indoor=no` + + + + +### level + + + +The question is *On what level is this feature located?* + +This rendering asks information about the property [level](https://wiki.openstreetmap.org/wiki/Key:level) + +This is rendered with `Located on the {level}th floor` + + + + + + - *Located underground* corresponds with `location=underground` + - This option cannot be chosen as answer + - *Located on the ground floor* corresponds with `level=0` + - *Located on the ground floor* corresponds with `` + - This option cannot be chosen as answer + - *Located on the first floor* corresponds with `level=1` + - *Located on the first basement level* corresponds with `level=-1` + + + + +### leftover-questions + + + +This tagrendering has no question and is thus read-only + + + + + +### minimap + + + +Shows a small map with the feature. Added by default to every popup + +This tagrendering has no question and is thus read-only + + + + + +### last_edit + + + +Gives some metainfo about the last edit and who did edit it - rendering only + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `_last_edit:contributor~.+&_last_edit:changeset~.+` + + + +### all-tags + + + +This tagrendering has no question and is thus read-only + + + + + +#### Filters + + + + + +id | question | osmTags +---- | ---------- | --------- +open_now.0 | Open now | _isOpen=yes + + +This document is autogenerated from [assets/themes/elongated_coin/elongated_coin.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/elongated_coin/elongated_coin.json) diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md index 0b9af8b9a..51b092a28 100644 --- a/Docs/Layers/entrance.md +++ b/Docs/Layers/entrance.md @@ -85,7 +85,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/etymology.md b/Docs/Layers/etymology.md index acfb8150a..83cdfb304 100644 --- a/Docs/Layers/etymology.md +++ b/Docs/Layers/etymology.md @@ -131,7 +131,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/extinguisher.md b/Docs/Layers/extinguisher.md index 9880f4aa2..753598d58 100644 --- a/Docs/Layers/extinguisher.md +++ b/Docs/Layers/extinguisher.md @@ -95,7 +95,7 @@ This is rendered with `Location: {location}` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/facadegardens.md b/Docs/Layers/facadegardens.md index c1f297172..449d773c8 100644 --- a/Docs/Layers/facadegardens.md +++ b/Docs/Layers/facadegardens.md @@ -80,7 +80,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/fietsstraat.md b/Docs/Layers/fietsstraat.md index bb706e542..4675aec8d 100644 --- a/Docs/Layers/fietsstraat.md +++ b/Docs/Layers/fietsstraat.md @@ -134,7 +134,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/fire_station.md b/Docs/Layers/fire_station.md index bf361d2de..d20de2829 100644 --- a/Docs/Layers/fire_station.md +++ b/Docs/Layers/fire_station.md @@ -162,7 +162,7 @@ This is rendered with `The operator is a(n) {operator:type} entity.` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md index 7800a8d8d..0990692ae 100644 --- a/Docs/Layers/fitness_centre.md +++ b/Docs/Layers/fitness_centre.md @@ -100,7 +100,7 @@ This is rendered with `This fitness centre is called {name}` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md index adb3a3881..6ad72cd5c 100644 --- a/Docs/Layers/fitness_station.md +++ b/Docs/Layers/fitness_station.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md index f27a91d31..cc9eefb8e 100644 --- a/Docs/Layers/food.md +++ b/Docs/Layers/food.md @@ -103,7 +103,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md index bf88fc404..5960b44e3 100644 --- a/Docs/Layers/friture.md +++ b/Docs/Layers/friture.md @@ -99,7 +99,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/ghost_bike.md b/Docs/Layers/ghost_bike.md index 698be580f..9b921a511 100644 --- a/Docs/Layers/ghost_bike.md +++ b/Docs/Layers/ghost_bike.md @@ -88,7 +88,7 @@ This tagrendering has no question and is thus read-only -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/governments.md b/Docs/Layers/governments.md index fd889527a..8eca3d7be 100644 --- a/Docs/Layers/governments.md +++ b/Docs/Layers/governments.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md index c89f0d2bd..57a51adb9 100644 --- a/Docs/Layers/hackerspace.md +++ b/Docs/Layers/hackerspace.md @@ -87,7 +87,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -335,7 +335,7 @@ This is rendered with `This hackerspace was founded at {start_date}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/health_and_social_places_without_etymology.md b/Docs/Layers/health_and_social_places_without_etymology.md index 0db149153..ca3f6b4d1 100644 --- a/Docs/Layers/health_and_social_places_without_etymology.md +++ b/Docs/Layers/health_and_social_places_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md index fe39f055d..b9ffab189 100644 --- a/Docs/Layers/hotel.md +++ b/Docs/Layers/hotel.md @@ -83,7 +83,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/hydrant.md b/Docs/Layers/hydrant.md index 62d93ce05..09ce5c34c 100644 --- a/Docs/Layers/hydrant.md +++ b/Docs/Layers/hydrant.md @@ -203,7 +203,7 @@ This is rendered with `Coupling diameters: {couplings:diameters}` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/indoors.md b/Docs/Layers/indoors.md index 1b1129ea5..2a162699c 100644 --- a/Docs/Layers/indoors.md +++ b/Docs/Layers/indoors.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/information_board.md b/Docs/Layers/information_board.md index f18919e35..b62b1f0a4 100644 --- a/Docs/Layers/information_board.md +++ b/Docs/Layers/information_board.md @@ -74,7 +74,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md index 8371c6758..7b80e792b 100644 --- a/Docs/Layers/kerbs.md +++ b/Docs/Layers/kerbs.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/lit_streets.md b/Docs/Layers/lit_streets.md index 984da9ad7..90b5970cc 100644 --- a/Docs/Layers/lit_streets.md +++ b/Docs/Layers/lit_streets.md @@ -73,7 +73,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md index c7a9aa5e3..d85e6ae3c 100644 --- a/Docs/Layers/map.md +++ b/Docs/Layers/map.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -118,7 +118,7 @@ The question is *What is the size of the shown area on the map?* - *A map of the rooms within a building* corresponds with `map_size=building` - *A map of special site, like of a historical castle, a park, a campus, a forest, ....* corresponds with `map_size=site` - *A map showing the village or town* corresponds with `map_size=village` - - * A map of a city.* corresponds with `map_size=city` + - * A map of a city* corresponds with `map_size=city` - *The map of an entire region, showing multiple cities and villages* corresponds with `map_size=region` diff --git a/Docs/Layers/medical-shops.md b/Docs/Layers/medical-shops.md index 0324b6812..842c90ffa 100644 --- a/Docs/Layers/medical-shops.md +++ b/Docs/Layers/medical-shops.md @@ -5,7 +5,7 @@ - + A shop @@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | @@ -83,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -105,6 +106,184 @@ This is rendered with `This shop is called {name}` +### shop_types + + + +The question is *What kind of shop is this?* + +This rendering asks information about the property [shop](https://wiki.openstreetmap.org/wiki/Key:shop) + +This is rendered with `This is a {shop}` + + + + + + - *Farm Supply Shop* corresponds with `shop=agrarian` + - *Liquor Store* corresponds with `shop=alcohol` + - *Anime / Manga Shop* corresponds with `shop=anime` + - *Antiques Shop* corresponds with `shop=antiques` + - *Appliance Store* corresponds with `shop=appliance` + - *Art Store* corresponds with `shop=art` + - *Baby Goods Store* corresponds with `shop=baby_goods` + - *Bag/Luggage Store* corresponds with `shop=bag` + - *Bakery* corresponds with `shop=bakery` + - *Bathroom Furnishing Store* corresponds with `shop=bathroom_furnishing` + - *Beauty Shop* corresponds with `shop=beauty` + - *Bedding/Mattress Store* corresponds with `shop=bed` + - *Beverage Store* corresponds with `shop=beverages` + - *Bicycle Shop* corresponds with `shop=bicycle` + - *Boat Store* corresponds with `shop=boat` + - *Bookmaker* corresponds with `shop=bookmaker` + - *Book Store* corresponds with `shop=books` + - *Brewing Supply Store* corresponds with `shop=brewing_supplies` + - *Butcher* corresponds with `shop=butcher` + - *Camera Equipment Store* corresponds with `shop=camera` + - *Candle Shop* corresponds with `shop=candles` + - *Cannabis Shop* corresponds with `shop=cannabis` + - *Car Dealership* corresponds with `shop=car` + - *Car Parts Store* corresponds with `shop=car_parts` + - *Car Repair Shop* corresponds with `shop=car_repair` + - *RV Dealership* corresponds with `shop=caravan` + - *Carpet Store* corresponds with `shop=carpet` + - *Catalog Shop* corresponds with `shop=catalogue` + - *Charity Store* corresponds with `shop=charity` + - *Cheese Store* corresponds with `shop=cheese` + - *Drugstore* corresponds with `shop=chemist` + - *Chocolate Store* corresponds with `shop=chocolate` + - *Clothing Store* corresponds with `shop=clothes` + - *Coffee Store* corresponds with `shop=coffee` + - *Collectibles Shop* corresponds with `shop=collector` + - *Computer Store* corresponds with `shop=computer` + - *Candy Store* corresponds with `shop=confectionery` + - *Convenience Store* corresponds with `shop=convenience` + - *Copy Store* corresponds with `shop=copyshop` + - *Cosmetics Store* corresponds with `shop=cosmetics` + - *Country Store* corresponds with `shop=country_store` + - *Arts & Crafts Store* corresponds with `shop=craft` + - *Curtain Store* corresponds with `shop=curtain` + - *Dairy Store* corresponds with `shop=dairy` + - *Deli* corresponds with `shop=deli` + - *Department Store* corresponds with `shop=department_store` + - *DIY Store* corresponds with `shop=doityourself` + - *Door Shop* corresponds with `shop=doors` + - *Dry Cleaner* corresponds with `shop=dry_cleaning` + - *E-Cigarette Shop* corresponds with `shop=e-cigarette` + - *Electrical Equipment Store* corresponds with `shop=electrical` + - *Electronics Store* corresponds with `shop=electronics` + - *Erotic Store* corresponds with `shop=erotic` + - *Fabric Store* corresponds with `shop=fabric` + - *Produce Stand* corresponds with `shop=farm` + - *Fashion Accessories Store* corresponds with `shop=fashion_accessories` + - *Fireplace Store* corresponds with `shop=fireplace` + - *Fishing Shop* corresponds with `shop=fishing` + - *Flooring Supply Shop* corresponds with `shop=flooring` + - *Florist* corresponds with `shop=florist` + - *Framing Shop* corresponds with `shop=frame` + - *Frozen Food Store* corresponds with `shop=frozen_food` + - *Fuel Shop* corresponds with `shop=fuel` + - *Funeral Home* corresponds with `shop=funeral_directors` + - *Furniture Store* corresponds with `shop=furniture` + - *Tabletop Game Store* corresponds with `shop=games` + - *Garden Center* corresponds with `shop=garden_centre` + - *Bottled Gas Shop* corresponds with `shop=gas` + - *General Store* corresponds with `shop=general` + - *Gift Shop* corresponds with `shop=gift` + - *Greengrocer* corresponds with `shop=greengrocer` + - *Hairdresser* corresponds with `shop=hairdresser` + - *Hairdresser Supply Store* corresponds with `shop=hairdresser_supply` + - *Hardware Store* corresponds with `shop=hardware` + - *Health Food Shop* corresponds with `shop=health_food` + - *Hearing Aids Store* corresponds with `shop=hearing_aids` + - *Herbalist* corresponds with `shop=herbalist` + - *Hifi Store* corresponds with `shop=hifi` + - *Hobby Shop* corresponds with `shop=hobby` + - *Household Linen Shop* corresponds with `shop=household_linen` + - *Houseware Store* corresponds with `shop=houseware` + - *Hunting Shop* corresponds with `shop=hunting` + - *Interior Decoration Store* corresponds with `shop=interior_decoration` + - *Jewelry Store* corresponds with `shop=jewelry` + - *Kiosk* corresponds with `shop=kiosk` + - *Kitchen Design Store* corresponds with `shop=kitchen` + - *Laundry* corresponds with `shop=laundry` + - *Leather Store* corresponds with `shop=leather` + - *Lighting Store* corresponds with `shop=lighting` + - *Locksmith* corresponds with `shop=locksmith` + - *Lottery Shop* corresponds with `shop=lottery` + - *Mall* corresponds with `shop=mall` + - *Massage Shop* corresponds with `shop=massage` + - *Medical Supply Store* corresponds with `shop=medical_supply` + - *Military Surplus Store* corresponds with `shop=military_surplus` + - *Mobile Phone Store* corresponds with `shop=mobile_phone` + - *Model Shop* corresponds with `shop=model` + - *Money Lender* corresponds with `shop=money_lender` + - *Motorcycle Dealership* corresponds with `shop=motorcycle` + - *Motorcycle Repair Shop* corresponds with `shop=motorcycle_repair` + - *Music Store* corresponds with `shop=music` + - *Musical Instrument Store* corresponds with `shop=musical_instrument` + - *Newspaper/Magazine Shop* corresponds with `shop=newsagent` + - *Nutrition Supplements Store* corresponds with `shop=nutrition_supplements` + - *Optician* corresponds with `shop=optician` + - *Outdoors Store* corresponds with `shop=outdoor` + - *Online Retailer Outpost* corresponds with `shop=outpost` + - *Paint Store* corresponds with `shop=paint` + - *Party Supply Store* corresponds with `shop=party` + - *Pastry Shop* corresponds with `shop=pastry` + - *Pawn Shop* corresponds with `shop=pawnbroker` + - *Perfume Store* corresponds with `shop=perfumery` + - *Pet Store* corresponds with `shop=pet` + - *Pet Grooming Store* corresponds with `shop=pet_grooming` + - *Photography Store* corresponds with `shop=photo` + - *Pottery Store* corresponds with `shop=pottery` + - *Printer Ink Store* corresponds with `shop=printer_ink` + - *Psychic* corresponds with `shop=psychic` + - *Fireworks Store* corresponds with `shop=pyrotechnics` + - *Radio/Electronic Component Store* corresponds with `shop=radiotechnics` + - *Religious Store* corresponds with `shop=religion` + - *Rental Shop* corresponds with `shop=rental` + - *Repair Shop* corresponds with `shop=repair` + - *Scuba Diving Shop* corresponds with `shop=scuba_diving` + - *Seafood Shop* corresponds with `shop=seafood` + - *Consignment/Thrift Store* corresponds with `shop=second_hand` + - *Sewing Supply Shop* corresponds with `shop=sewing` + - *Shoe Repair Shop* corresponds with `shop=shoe_repair` + - *Shoe Store* corresponds with `shop=shoes` + - *Spice Shop* corresponds with `shop=spices` + - *Sporting Goods Store* corresponds with `shop=sports` + - *Stationery Store* corresponds with `shop=stationery` + - *Storage Rental* corresponds with `shop=storage_rental` + - *Supermarket* corresponds with `shop=supermarket` + - *Pool Supply Store* corresponds with `shop=swimming_pool` + - *Tailor* corresponds with `shop=tailor` + - *Tattoo Parlor* corresponds with `shop=tattoo` + - *Tea Store* corresponds with `shop=tea` + - *Telecom Retail Store* corresponds with `shop=telecommunication` + - *Ticket Seller* corresponds with `shop=ticket` + - *Tile Shop* corresponds with `shop=tiles` + - *Tobacco Shop* corresponds with `shop=tobacco` + - *Tool Rental* corresponds with `shop=tool_hire` + - *Toy Store* corresponds with `shop=toys` + - *Trade Shop* corresponds with `shop=trade` + - *Travel Agency* corresponds with `shop=travel_agency` + - *Trophy Shop* corresponds with `shop=trophy` + - *Tire Store* corresponds with `shop=tyres` + - *Vacuum Cleaner Store* corresponds with `shop=vacuum_cleaner` + - *Variety Store* corresponds with `shop=variety_store` + - *Video Store* corresponds with `shop=video` + - *Video Game Store* corresponds with `shop=video_games` + - *Watches Shop* corresponds with `shop=watches` + - *Drinking Water Shop* corresponds with `shop=water` + - *Watersport/Swim Shop* corresponds with `shop=water_sports` + - *Weapon Shop* corresponds with `shop=weapons` + - *Wholesale Store* corresponds with `shop=wholesale` + - *Wig Shop* corresponds with `shop=wigs` + - *Window Blind Store* corresponds with `shop=window_blind` + - *Wine Shop* corresponds with `shop=wine` + + + + ### opening_hours @@ -339,7 +518,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md index ab54b49b6..d8b60dc18 100644 --- a/Docs/Layers/nature_reserve.md +++ b/Docs/Layers/nature_reserve.md @@ -85,7 +85,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/observation_tower.md b/Docs/Layers/observation_tower.md index 73eabf887..b51db5992 100644 --- a/Docs/Layers/observation_tower.md +++ b/Docs/Layers/observation_tower.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -162,7 +162,7 @@ This tagrendering is only visible in the popup if the following condition is met -### payment-options +### Payment methods diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md index 9d10ff575..d1be35039 100644 --- a/Docs/Layers/parcel_lockers.md +++ b/Docs/Layers/parcel_lockers.md @@ -80,7 +80,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/parking.md b/Docs/Layers/parking.md index 70275edc7..bf16b8062 100644 --- a/Docs/Layers/parking.md +++ b/Docs/Layers/parking.md @@ -80,7 +80,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/parking_spaces.md b/Docs/Layers/parking_spaces.md index e64347ea3..d9faf8d13 100644 --- a/Docs/Layers/parking_spaces.md +++ b/Docs/Layers/parking_spaces.md @@ -77,7 +77,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/parking_ticket_machine.md b/Docs/Layers/parking_ticket_machine.md index daa78df0c..86b462aa9 100644 --- a/Docs/Layers/parking_ticket_machine.md +++ b/Docs/Layers/parking_ticket_machine.md @@ -77,7 +77,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -135,7 +135,7 @@ The question is *What coins can you use to pay here?* - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR` @@ -158,7 +158,7 @@ The question is *what notes can you use to pay here?* - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR` diff --git a/Docs/Layers/parks_and_forests_without_etymology.md b/Docs/Layers/parks_and_forests_without_etymology.md index b3c413f35..bf5e0ad90 100644 --- a/Docs/Layers/parks_and_forests_without_etymology.md +++ b/Docs/Layers/parks_and_forests_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md index 215a6ab48..4671c8cda 100644 --- a/Docs/Layers/pharmacy.md +++ b/Docs/Layers/pharmacy.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md index 38cec9a0c..15d4c8c7d 100644 --- a/Docs/Layers/physiotherapist.md +++ b/Docs/Layers/physiotherapist.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/picnic_table.md b/Docs/Layers/picnic_table.md index 21de25c6c..95804cbdf 100644 --- a/Docs/Layers/picnic_table.md +++ b/Docs/Layers/picnic_table.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/play_forest.md b/Docs/Layers/play_forest.md index f9d35f96e..781123bd0 100644 --- a/Docs/Layers/play_forest.md +++ b/Docs/Layers/play_forest.md @@ -66,7 +66,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -143,7 +143,7 @@ This is rendered with `De bevoegde dienst kan getelefoneerd worden via {phone}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/playground.md b/Docs/Layers/playground.md index f2ccfffd0..7b9281b44 100644 --- a/Docs/Layers/playground.md +++ b/Docs/Layers/playground.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -296,7 +296,7 @@ This is rendered with `{opening_hours_table(opening_hours)}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/postboxes.md b/Docs/Layers/postboxes.md index 1fbe7c0c1..5c6d648e5 100644 --- a/Docs/Layers/postboxes.md +++ b/Docs/Layers/postboxes.md @@ -74,7 +74,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/postoffices.md b/Docs/Layers/postoffices.md index 7f618b5c6..faa0d7348 100644 --- a/Docs/Layers/postoffices.md +++ b/Docs/Layers/postoffices.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md index 999205c7a..8f3bf07a2 100644 --- a/Docs/Layers/public_bookcase.md +++ b/Docs/Layers/public_bookcase.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/rainbow_crossing_high_zoom.md b/Docs/Layers/rainbow_crossing_high_zoom.md index ca5d5e511..72ce919f3 100644 --- a/Docs/Layers/rainbow_crossing_high_zoom.md +++ b/Docs/Layers/rainbow_crossing_high_zoom.md @@ -74,7 +74,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/rainbow_crossings.md b/Docs/Layers/rainbow_crossings.md index ba84fad08..070e32cba 100644 --- a/Docs/Layers/rainbow_crossings.md +++ b/Docs/Layers/rainbow_crossings.md @@ -75,7 +75,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/reception_desk.md b/Docs/Layers/reception_desk.md index 1c080dbab..ce908adfa 100644 --- a/Docs/Layers/reception_desk.md +++ b/Docs/Layers/reception_desk.md @@ -77,7 +77,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index c81c04ffa..4fa8aa799 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md index f52f987b2..307f7b8ee 100644 --- a/Docs/Layers/shops.md +++ b/Docs/Layers/shops.md @@ -5,7 +5,7 @@ - + A shop @@ -52,6 +52,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | @@ -88,7 +89,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -110,6 +111,184 @@ This is rendered with `This shop is called {name}` +### shop_types + + + +The question is *What kind of shop is this?* + +This rendering asks information about the property [shop](https://wiki.openstreetmap.org/wiki/Key:shop) + +This is rendered with `This is a {shop}` + + + + + + - *Farm Supply Shop* corresponds with `shop=agrarian` + - *Liquor Store* corresponds with `shop=alcohol` + - *Anime / Manga Shop* corresponds with `shop=anime` + - *Antiques Shop* corresponds with `shop=antiques` + - *Appliance Store* corresponds with `shop=appliance` + - *Art Store* corresponds with `shop=art` + - *Baby Goods Store* corresponds with `shop=baby_goods` + - *Bag/Luggage Store* corresponds with `shop=bag` + - *Bakery* corresponds with `shop=bakery` + - *Bathroom Furnishing Store* corresponds with `shop=bathroom_furnishing` + - *Beauty Shop* corresponds with `shop=beauty` + - *Bedding/Mattress Store* corresponds with `shop=bed` + - *Beverage Store* corresponds with `shop=beverages` + - *Bicycle Shop* corresponds with `shop=bicycle` + - *Boat Store* corresponds with `shop=boat` + - *Bookmaker* corresponds with `shop=bookmaker` + - *Book Store* corresponds with `shop=books` + - *Brewing Supply Store* corresponds with `shop=brewing_supplies` + - *Butcher* corresponds with `shop=butcher` + - *Camera Equipment Store* corresponds with `shop=camera` + - *Candle Shop* corresponds with `shop=candles` + - *Cannabis Shop* corresponds with `shop=cannabis` + - *Car Dealership* corresponds with `shop=car` + - *Car Parts Store* corresponds with `shop=car_parts` + - *Car Repair Shop* corresponds with `shop=car_repair` + - *RV Dealership* corresponds with `shop=caravan` + - *Carpet Store* corresponds with `shop=carpet` + - *Catalog Shop* corresponds with `shop=catalogue` + - *Charity Store* corresponds with `shop=charity` + - *Cheese Store* corresponds with `shop=cheese` + - *Drugstore* corresponds with `shop=chemist` + - *Chocolate Store* corresponds with `shop=chocolate` + - *Clothing Store* corresponds with `shop=clothes` + - *Coffee Store* corresponds with `shop=coffee` + - *Collectibles Shop* corresponds with `shop=collector` + - *Computer Store* corresponds with `shop=computer` + - *Candy Store* corresponds with `shop=confectionery` + - *Convenience Store* corresponds with `shop=convenience` + - *Copy Store* corresponds with `shop=copyshop` + - *Cosmetics Store* corresponds with `shop=cosmetics` + - *Country Store* corresponds with `shop=country_store` + - *Arts & Crafts Store* corresponds with `shop=craft` + - *Curtain Store* corresponds with `shop=curtain` + - *Dairy Store* corresponds with `shop=dairy` + - *Deli* corresponds with `shop=deli` + - *Department Store* corresponds with `shop=department_store` + - *DIY Store* corresponds with `shop=doityourself` + - *Door Shop* corresponds with `shop=doors` + - *Dry Cleaner* corresponds with `shop=dry_cleaning` + - *E-Cigarette Shop* corresponds with `shop=e-cigarette` + - *Electrical Equipment Store* corresponds with `shop=electrical` + - *Electronics Store* corresponds with `shop=electronics` + - *Erotic Store* corresponds with `shop=erotic` + - *Fabric Store* corresponds with `shop=fabric` + - *Produce Stand* corresponds with `shop=farm` + - *Fashion Accessories Store* corresponds with `shop=fashion_accessories` + - *Fireplace Store* corresponds with `shop=fireplace` + - *Fishing Shop* corresponds with `shop=fishing` + - *Flooring Supply Shop* corresponds with `shop=flooring` + - *Florist* corresponds with `shop=florist` + - *Framing Shop* corresponds with `shop=frame` + - *Frozen Food Store* corresponds with `shop=frozen_food` + - *Fuel Shop* corresponds with `shop=fuel` + - *Funeral Home* corresponds with `shop=funeral_directors` + - *Furniture Store* corresponds with `shop=furniture` + - *Tabletop Game Store* corresponds with `shop=games` + - *Garden Center* corresponds with `shop=garden_centre` + - *Bottled Gas Shop* corresponds with `shop=gas` + - *General Store* corresponds with `shop=general` + - *Gift Shop* corresponds with `shop=gift` + - *Greengrocer* corresponds with `shop=greengrocer` + - *Hairdresser* corresponds with `shop=hairdresser` + - *Hairdresser Supply Store* corresponds with `shop=hairdresser_supply` + - *Hardware Store* corresponds with `shop=hardware` + - *Health Food Shop* corresponds with `shop=health_food` + - *Hearing Aids Store* corresponds with `shop=hearing_aids` + - *Herbalist* corresponds with `shop=herbalist` + - *Hifi Store* corresponds with `shop=hifi` + - *Hobby Shop* corresponds with `shop=hobby` + - *Household Linen Shop* corresponds with `shop=household_linen` + - *Houseware Store* corresponds with `shop=houseware` + - *Hunting Shop* corresponds with `shop=hunting` + - *Interior Decoration Store* corresponds with `shop=interior_decoration` + - *Jewelry Store* corresponds with `shop=jewelry` + - *Kiosk* corresponds with `shop=kiosk` + - *Kitchen Design Store* corresponds with `shop=kitchen` + - *Laundry* corresponds with `shop=laundry` + - *Leather Store* corresponds with `shop=leather` + - *Lighting Store* corresponds with `shop=lighting` + - *Locksmith* corresponds with `shop=locksmith` + - *Lottery Shop* corresponds with `shop=lottery` + - *Mall* corresponds with `shop=mall` + - *Massage Shop* corresponds with `shop=massage` + - *Medical Supply Store* corresponds with `shop=medical_supply` + - *Military Surplus Store* corresponds with `shop=military_surplus` + - *Mobile Phone Store* corresponds with `shop=mobile_phone` + - *Model Shop* corresponds with `shop=model` + - *Money Lender* corresponds with `shop=money_lender` + - *Motorcycle Dealership* corresponds with `shop=motorcycle` + - *Motorcycle Repair Shop* corresponds with `shop=motorcycle_repair` + - *Music Store* corresponds with `shop=music` + - *Musical Instrument Store* corresponds with `shop=musical_instrument` + - *Newspaper/Magazine Shop* corresponds with `shop=newsagent` + - *Nutrition Supplements Store* corresponds with `shop=nutrition_supplements` + - *Optician* corresponds with `shop=optician` + - *Outdoors Store* corresponds with `shop=outdoor` + - *Online Retailer Outpost* corresponds with `shop=outpost` + - *Paint Store* corresponds with `shop=paint` + - *Party Supply Store* corresponds with `shop=party` + - *Pastry Shop* corresponds with `shop=pastry` + - *Pawn Shop* corresponds with `shop=pawnbroker` + - *Perfume Store* corresponds with `shop=perfumery` + - *Pet Store* corresponds with `shop=pet` + - *Pet Grooming Store* corresponds with `shop=pet_grooming` + - *Photography Store* corresponds with `shop=photo` + - *Pottery Store* corresponds with `shop=pottery` + - *Printer Ink Store* corresponds with `shop=printer_ink` + - *Psychic* corresponds with `shop=psychic` + - *Fireworks Store* corresponds with `shop=pyrotechnics` + - *Radio/Electronic Component Store* corresponds with `shop=radiotechnics` + - *Religious Store* corresponds with `shop=religion` + - *Rental Shop* corresponds with `shop=rental` + - *Repair Shop* corresponds with `shop=repair` + - *Scuba Diving Shop* corresponds with `shop=scuba_diving` + - *Seafood Shop* corresponds with `shop=seafood` + - *Consignment/Thrift Store* corresponds with `shop=second_hand` + - *Sewing Supply Shop* corresponds with `shop=sewing` + - *Shoe Repair Shop* corresponds with `shop=shoe_repair` + - *Shoe Store* corresponds with `shop=shoes` + - *Spice Shop* corresponds with `shop=spices` + - *Sporting Goods Store* corresponds with `shop=sports` + - *Stationery Store* corresponds with `shop=stationery` + - *Storage Rental* corresponds with `shop=storage_rental` + - *Supermarket* corresponds with `shop=supermarket` + - *Pool Supply Store* corresponds with `shop=swimming_pool` + - *Tailor* corresponds with `shop=tailor` + - *Tattoo Parlor* corresponds with `shop=tattoo` + - *Tea Store* corresponds with `shop=tea` + - *Telecom Retail Store* corresponds with `shop=telecommunication` + - *Ticket Seller* corresponds with `shop=ticket` + - *Tile Shop* corresponds with `shop=tiles` + - *Tobacco Shop* corresponds with `shop=tobacco` + - *Tool Rental* corresponds with `shop=tool_hire` + - *Toy Store* corresponds with `shop=toys` + - *Trade Shop* corresponds with `shop=trade` + - *Travel Agency* corresponds with `shop=travel_agency` + - *Trophy Shop* corresponds with `shop=trophy` + - *Tire Store* corresponds with `shop=tyres` + - *Vacuum Cleaner Store* corresponds with `shop=vacuum_cleaner` + - *Variety Store* corresponds with `shop=variety_store` + - *Video Store* corresponds with `shop=video` + - *Video Game Store* corresponds with `shop=video_games` + - *Watches Shop* corresponds with `shop=watches` + - *Drinking Water Shop* corresponds with `shop=water` + - *Watersport/Swim Shop* corresponds with `shop=water_sports` + - *Weapon Shop* corresponds with `shop=weapons` + - *Wholesale Store* corresponds with `shop=wholesale` + - *Wig Shop* corresponds with `shop=wigs` + - *Window Blind Store* corresponds with `shop=window_blind` + - *Wine Shop* corresponds with `shop=wine` + + + + ### opening_hours @@ -344,7 +523,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/shops_with_climbing_shoe_repair.md b/Docs/Layers/shops_with_climbing_shoe_repair.md index 764b09ac6..51959129e 100644 --- a/Docs/Layers/shops_with_climbing_shoe_repair.md +++ b/Docs/Layers/shops_with_climbing_shoe_repair.md @@ -101,7 +101,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -535,7 +535,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/shower.md b/Docs/Layers/shower.md index 8ab8206b6..3494c6501 100644 --- a/Docs/Layers/shower.md +++ b/Docs/Layers/shower.md @@ -80,7 +80,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/slow_roads.md b/Docs/Layers/slow_roads.md index 07218bc1d..06ea63969 100644 --- a/Docs/Layers/slow_roads.md +++ b/Docs/Layers/slow_roads.md @@ -65,7 +65,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index c847d6c3e..016d5c4a7 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -83,7 +83,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -252,7 +252,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/sport_places_without_etymology.md b/Docs/Layers/sport_places_without_etymology.md index f5355b239..892056873 100644 --- a/Docs/Layers/sport_places_without_etymology.md +++ b/Docs/Layers/sport_places_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md index e55583789..5d88906ee 100644 --- a/Docs/Layers/sport_shops.md +++ b/Docs/Layers/sport_shops.md @@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | @@ -83,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -105,6 +106,184 @@ This is rendered with `This shop is called {name}` +### shop_types + + + +The question is *What kind of shop is this?* + +This rendering asks information about the property [shop](https://wiki.openstreetmap.org/wiki/Key:shop) + +This is rendered with `This is a {shop}` + + + + + + - *Farm Supply Shop* corresponds with `shop=agrarian` + - *Liquor Store* corresponds with `shop=alcohol` + - *Anime / Manga Shop* corresponds with `shop=anime` + - *Antiques Shop* corresponds with `shop=antiques` + - *Appliance Store* corresponds with `shop=appliance` + - *Art Store* corresponds with `shop=art` + - *Baby Goods Store* corresponds with `shop=baby_goods` + - *Bag/Luggage Store* corresponds with `shop=bag` + - *Bakery* corresponds with `shop=bakery` + - *Bathroom Furnishing Store* corresponds with `shop=bathroom_furnishing` + - *Beauty Shop* corresponds with `shop=beauty` + - *Bedding/Mattress Store* corresponds with `shop=bed` + - *Beverage Store* corresponds with `shop=beverages` + - *Bicycle Shop* corresponds with `shop=bicycle` + - *Boat Store* corresponds with `shop=boat` + - *Bookmaker* corresponds with `shop=bookmaker` + - *Book Store* corresponds with `shop=books` + - *Brewing Supply Store* corresponds with `shop=brewing_supplies` + - *Butcher* corresponds with `shop=butcher` + - *Camera Equipment Store* corresponds with `shop=camera` + - *Candle Shop* corresponds with `shop=candles` + - *Cannabis Shop* corresponds with `shop=cannabis` + - *Car Dealership* corresponds with `shop=car` + - *Car Parts Store* corresponds with `shop=car_parts` + - *Car Repair Shop* corresponds with `shop=car_repair` + - *RV Dealership* corresponds with `shop=caravan` + - *Carpet Store* corresponds with `shop=carpet` + - *Catalog Shop* corresponds with `shop=catalogue` + - *Charity Store* corresponds with `shop=charity` + - *Cheese Store* corresponds with `shop=cheese` + - *Drugstore* corresponds with `shop=chemist` + - *Chocolate Store* corresponds with `shop=chocolate` + - *Clothing Store* corresponds with `shop=clothes` + - *Coffee Store* corresponds with `shop=coffee` + - *Collectibles Shop* corresponds with `shop=collector` + - *Computer Store* corresponds with `shop=computer` + - *Candy Store* corresponds with `shop=confectionery` + - *Convenience Store* corresponds with `shop=convenience` + - *Copy Store* corresponds with `shop=copyshop` + - *Cosmetics Store* corresponds with `shop=cosmetics` + - *Country Store* corresponds with `shop=country_store` + - *Arts & Crafts Store* corresponds with `shop=craft` + - *Curtain Store* corresponds with `shop=curtain` + - *Dairy Store* corresponds with `shop=dairy` + - *Deli* corresponds with `shop=deli` + - *Department Store* corresponds with `shop=department_store` + - *DIY Store* corresponds with `shop=doityourself` + - *Door Shop* corresponds with `shop=doors` + - *Dry Cleaner* corresponds with `shop=dry_cleaning` + - *E-Cigarette Shop* corresponds with `shop=e-cigarette` + - *Electrical Equipment Store* corresponds with `shop=electrical` + - *Electronics Store* corresponds with `shop=electronics` + - *Erotic Store* corresponds with `shop=erotic` + - *Fabric Store* corresponds with `shop=fabric` + - *Produce Stand* corresponds with `shop=farm` + - *Fashion Accessories Store* corresponds with `shop=fashion_accessories` + - *Fireplace Store* corresponds with `shop=fireplace` + - *Fishing Shop* corresponds with `shop=fishing` + - *Flooring Supply Shop* corresponds with `shop=flooring` + - *Florist* corresponds with `shop=florist` + - *Framing Shop* corresponds with `shop=frame` + - *Frozen Food Store* corresponds with `shop=frozen_food` + - *Fuel Shop* corresponds with `shop=fuel` + - *Funeral Home* corresponds with `shop=funeral_directors` + - *Furniture Store* corresponds with `shop=furniture` + - *Tabletop Game Store* corresponds with `shop=games` + - *Garden Center* corresponds with `shop=garden_centre` + - *Bottled Gas Shop* corresponds with `shop=gas` + - *General Store* corresponds with `shop=general` + - *Gift Shop* corresponds with `shop=gift` + - *Greengrocer* corresponds with `shop=greengrocer` + - *Hairdresser* corresponds with `shop=hairdresser` + - *Hairdresser Supply Store* corresponds with `shop=hairdresser_supply` + - *Hardware Store* corresponds with `shop=hardware` + - *Health Food Shop* corresponds with `shop=health_food` + - *Hearing Aids Store* corresponds with `shop=hearing_aids` + - *Herbalist* corresponds with `shop=herbalist` + - *Hifi Store* corresponds with `shop=hifi` + - *Hobby Shop* corresponds with `shop=hobby` + - *Household Linen Shop* corresponds with `shop=household_linen` + - *Houseware Store* corresponds with `shop=houseware` + - *Hunting Shop* corresponds with `shop=hunting` + - *Interior Decoration Store* corresponds with `shop=interior_decoration` + - *Jewelry Store* corresponds with `shop=jewelry` + - *Kiosk* corresponds with `shop=kiosk` + - *Kitchen Design Store* corresponds with `shop=kitchen` + - *Laundry* corresponds with `shop=laundry` + - *Leather Store* corresponds with `shop=leather` + - *Lighting Store* corresponds with `shop=lighting` + - *Locksmith* corresponds with `shop=locksmith` + - *Lottery Shop* corresponds with `shop=lottery` + - *Mall* corresponds with `shop=mall` + - *Massage Shop* corresponds with `shop=massage` + - *Medical Supply Store* corresponds with `shop=medical_supply` + - *Military Surplus Store* corresponds with `shop=military_surplus` + - *Mobile Phone Store* corresponds with `shop=mobile_phone` + - *Model Shop* corresponds with `shop=model` + - *Money Lender* corresponds with `shop=money_lender` + - *Motorcycle Dealership* corresponds with `shop=motorcycle` + - *Motorcycle Repair Shop* corresponds with `shop=motorcycle_repair` + - *Music Store* corresponds with `shop=music` + - *Musical Instrument Store* corresponds with `shop=musical_instrument` + - *Newspaper/Magazine Shop* corresponds with `shop=newsagent` + - *Nutrition Supplements Store* corresponds with `shop=nutrition_supplements` + - *Optician* corresponds with `shop=optician` + - *Outdoors Store* corresponds with `shop=outdoor` + - *Online Retailer Outpost* corresponds with `shop=outpost` + - *Paint Store* corresponds with `shop=paint` + - *Party Supply Store* corresponds with `shop=party` + - *Pastry Shop* corresponds with `shop=pastry` + - *Pawn Shop* corresponds with `shop=pawnbroker` + - *Perfume Store* corresponds with `shop=perfumery` + - *Pet Store* corresponds with `shop=pet` + - *Pet Grooming Store* corresponds with `shop=pet_grooming` + - *Photography Store* corresponds with `shop=photo` + - *Pottery Store* corresponds with `shop=pottery` + - *Printer Ink Store* corresponds with `shop=printer_ink` + - *Psychic* corresponds with `shop=psychic` + - *Fireworks Store* corresponds with `shop=pyrotechnics` + - *Radio/Electronic Component Store* corresponds with `shop=radiotechnics` + - *Religious Store* corresponds with `shop=religion` + - *Rental Shop* corresponds with `shop=rental` + - *Repair Shop* corresponds with `shop=repair` + - *Scuba Diving Shop* corresponds with `shop=scuba_diving` + - *Seafood Shop* corresponds with `shop=seafood` + - *Consignment/Thrift Store* corresponds with `shop=second_hand` + - *Sewing Supply Shop* corresponds with `shop=sewing` + - *Shoe Repair Shop* corresponds with `shop=shoe_repair` + - *Shoe Store* corresponds with `shop=shoes` + - *Spice Shop* corresponds with `shop=spices` + - *Sporting Goods Store* corresponds with `shop=sports` + - *Stationery Store* corresponds with `shop=stationery` + - *Storage Rental* corresponds with `shop=storage_rental` + - *Supermarket* corresponds with `shop=supermarket` + - *Pool Supply Store* corresponds with `shop=swimming_pool` + - *Tailor* corresponds with `shop=tailor` + - *Tattoo Parlor* corresponds with `shop=tattoo` + - *Tea Store* corresponds with `shop=tea` + - *Telecom Retail Store* corresponds with `shop=telecommunication` + - *Ticket Seller* corresponds with `shop=ticket` + - *Tile Shop* corresponds with `shop=tiles` + - *Tobacco Shop* corresponds with `shop=tobacco` + - *Tool Rental* corresponds with `shop=tool_hire` + - *Toy Store* corresponds with `shop=toys` + - *Trade Shop* corresponds with `shop=trade` + - *Travel Agency* corresponds with `shop=travel_agency` + - *Trophy Shop* corresponds with `shop=trophy` + - *Tire Store* corresponds with `shop=tyres` + - *Vacuum Cleaner Store* corresponds with `shop=vacuum_cleaner` + - *Variety Store* corresponds with `shop=variety_store` + - *Video Store* corresponds with `shop=video` + - *Video Game Store* corresponds with `shop=video_games` + - *Watches Shop* corresponds with `shop=watches` + - *Drinking Water Shop* corresponds with `shop=water` + - *Watersport/Swim Shop* corresponds with `shop=water_sports` + - *Weapon Shop* corresponds with `shop=weapons` + - *Wholesale Store* corresponds with `shop=wholesale` + - *Wig Shop* corresponds with `shop=wigs` + - *Window Blind Store* corresponds with `shop=window_blind` + - *Wine Shop* corresponds with `shop=wine` + + + + ### opening_hours @@ -339,7 +518,7 @@ This tagrendering is only visible in the popup if the following condition is met -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/sports_centre.md b/Docs/Layers/sports_centre.md index a3fe7d952..d1c7bbbb5 100644 --- a/Docs/Layers/sports_centre.md +++ b/Docs/Layers/sports_centre.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/stairs.md b/Docs/Layers/stairs.md index 14b73a16c..dbef9f210 100644 --- a/Docs/Layers/stairs.md +++ b/Docs/Layers/stairs.md @@ -79,7 +79,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/street_lamps.md b/Docs/Layers/street_lamps.md index d19060a4a..353a2fddf 100644 --- a/Docs/Layers/street_lamps.md +++ b/Docs/Layers/street_lamps.md @@ -82,7 +82,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/streets_without_etymology.md b/Docs/Layers/streets_without_etymology.md index 662f25e38..27fc01f52 100644 --- a/Docs/Layers/streets_without_etymology.md +++ b/Docs/Layers/streets_without_etymology.md @@ -14,7 +14,7 @@ All objects which have an etymology known - - This layer is shown at zoomlevel **18** and higher + - This layer is shown at zoomlevel **15** and higher @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md index a7d63a3c8..e753f014a 100644 --- a/Docs/Layers/surveillance_camera.md +++ b/Docs/Layers/surveillance_camera.md @@ -83,7 +83,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md index 979cbedc2..7822d70a5 100644 --- a/Docs/Layers/tertiary_education.md +++ b/Docs/Layers/tertiary_education.md @@ -49,6 +49,8 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | [](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [college](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcollege) [university](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Duniversity) [](https://taginfo.openstreetmap.org/keys/isced:2011:level#values) [isced:2011:level](https://wiki.openstreetmap.org/wiki/Key:isced:2011:level) | Multiple choice | [bachelor](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Dbachelor) [master](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Dmaster) [doctorate](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Ddoctorate) +[](https://taginfo.openstreetmap.org/keys/capacity#values) [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | +[](https://taginfo.openstreetmap.org/keys/school:gender#values) [school:gender](https://wiki.openstreetmap.org/wiki/Key:school:gender) | Multiple choice | [mixed](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmixed) [separated](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dseparated) [male](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmale) [female](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dfemale) [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | @@ -110,6 +112,38 @@ This tagrendering is only visible in the popup if the following condition is met +### capacity + + + +The question is *How much students can at most enroll in this school?* + +This rendering asks information about the property [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) + +This is rendered with `This school can enroll at most {capacity} students` + + + + + +### gender + + + +The question is *Which genders can enroll at this school?* + + + + + + - *Both boys and girls can enroll here and have classes together* corresponds with `school:gender=mixed` + - *Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)* corresponds with `school:gender=separated` + - *This is a boys only-school* corresponds with `school:gender=male` + - *This is a girls-only school* corresponds with `school:gender=female` + + + + ### website diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md index cdd92135c..ffe3efe57 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -66,7 +66,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -168,7 +168,7 @@ The question is *What coins can you use to pay here?* - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR` @@ -191,7 +191,7 @@ The question is *what notes can you use to pay here?* - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR` diff --git a/Docs/Layers/ticket_validator.md b/Docs/Layers/ticket_validator.md index f53921236..49cda5dc0 100644 --- a/Docs/Layers/ticket_validator.md +++ b/Docs/Layers/ticket_validator.md @@ -65,7 +65,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/toekomstige_fietsstraat.md b/Docs/Layers/toekomstige_fietsstraat.md index 36945fe1f..f5631494b 100644 --- a/Docs/Layers/toekomstige_fietsstraat.md +++ b/Docs/Layers/toekomstige_fietsstraat.md @@ -134,7 +134,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index ad7140888..817afe48d 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -89,7 +89,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md index 2df4eb742..c928e1a6b 100644 --- a/Docs/Layers/toilet_at_amenity.md +++ b/Docs/Layers/toilet_at_amenity.md @@ -54,6 +54,11 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/toilets:wheelchair#values) [toilets:wheelchair](https://wiki.openstreetmap.org/wiki/Key:toilets:wheelchair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Dno) [designated](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Ddesignated) [](https://taginfo.openstreetmap.org/keys/toilets:door:width#values) [toilets:door:width](https://wiki.openstreetmap.org/wiki/Key:toilets:door:width) | [pfloat](../SpecialInputElements.md#pfloat) | +[](https://taginfo.openstreetmap.org/keys/toilets:position#values) [toilets:position](https://wiki.openstreetmap.org/wiki/Key:toilets:position) | Multiple choice | [seated](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated) [urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Durinal) [squat](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dsquat) [seated;urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated;urinal) +[](https://taginfo.openstreetmap.org/keys/changing_table#values) [changing_table](https://wiki.openstreetmap.org/wiki/Key:changing_table) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dno) +[](https://taginfo.openstreetmap.org/keys/changing_table:location#values) [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) | [string](../SpecialInputElements.md#string) | [female_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dfemale_toilet) [male_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dmale_toilet) [wheelchair_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dwheelchair_toilet) [dedicated_room](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room) +[](https://taginfo.openstreetmap.org/keys/toilets:handwashing#values) [toilets:handwashing](https://wiki.openstreetmap.org/wiki/Key:toilets:handwashing) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dno) +[](https://taginfo.openstreetmap.org/keys/toilets:paper_supplied#values) [toilets:paper_supplied](https://wiki.openstreetmap.org/wiki/Key:toilets:paper_supplied) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dno) [](https://taginfo.openstreetmap.org/keys/toilets:description#values) [toilets:description](https://wiki.openstreetmap.org/wiki/Key:toilets:description) | [string](../SpecialInputElements.md#string) | @@ -82,7 +87,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -218,52 +223,92 @@ This tagrendering is only visible in the popup if the following condition is met -### toilettoiletstype +### toilets-type -This tagrendering has no question and is thus read-only +The question is *Which kind of toilets are this?* -### toilettoiletschangingtable + - *There are only seated toilets* corresponds with `toilets:position=seated` + - *There are only urinals here* corresponds with `toilets:position=urinal` + - *There are only squat toilets here* corresponds with `toilets:position=squat` + - *Both seated toilets and urinals are available here* corresponds with `toilets:position=seated;urinal` -This tagrendering has no question and is thus read-only + +### toilets-changing-table + + + +The question is *Is a changing table (to change diapers) available?* -### toilettoiletchangingtablelocation + - *A changing table is available* corresponds with `changing_table=yes` + - *No changing table is available* corresponds with `changing_table=no` -This tagrendering has no question and is thus read-only + +### toilet-changing_table:location + + + +The question is *Where is the changing table located?* + +This rendering asks information about the property [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) + +This is rendered with `The changing table is located at {changing_table:location}` -### toilettoilethandwashing + - *The changing table is in the toilet for women. * corresponds with `changing_table:location=female_toilet` + - *The changing table is in the toilet for men. * corresponds with `changing_table:location=male_toilet` + - *The changing table is in the toilet for wheelchair users. * corresponds with `changing_table:location=wheelchair_toilet` + - *The changing table is in a dedicated room. * corresponds with `changing_table:location=dedicated_room` + + +This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes` -This tagrendering has no question and is thus read-only +### toilet-handwashing + + + +The question is *Do these toilets have a sink to wash your hands?* -### toilettoilethaspaper + - *This toilets have a sink to wash your hands* corresponds with `toilets:handwashing=yes` + - *This toilets don't have a sink to wash your hands* corresponds with `toilets:handwashing=no` -This tagrendering has no question and is thus read-only +### toilet-has-paper + + + +The question is *Does one have to bring their own toilet paper to this toilet?* + + + + + + - *This toilet is equipped with toilet paper* corresponds with `toilets:paper_supplied=yes` + - *You have to bring your own toilet paper to this toilet* corresponds with `toilets:paper_supplied=no` @@ -351,6 +396,13 @@ wheelchair.0 | Wheelchair accessible | toilets:wheelchair=yes\|toilets:wheelchai +id | question | osmTags +---- | ---------- | --------- +changing_table.0 | Has a changing table | changing_table=yes + + + + id | question | osmTags ---- | ---------- | --------- free.0 | Free to use | toilets:fee=no\|toilets:fee=0|toilets:charge=0 diff --git a/Docs/Layers/toursistic_places_without_etymology.md b/Docs/Layers/toursistic_places_without_etymology.md index 72e80cfb1..bab1c1734 100644 --- a/Docs/Layers/toursistic_places_without_etymology.md +++ b/Docs/Layers/toursistic_places_without_etymology.md @@ -130,7 +130,7 @@ This is rendered with `Named after {name:etymology}` -Show the images block at this location +Show the questions block at this location This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/trail.md b/Docs/Layers/trail.md index 5ddb701d7..66dac81fc 100644 --- a/Docs/Layers/trail.md +++ b/Docs/Layers/trail.md @@ -67,7 +67,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/transit_stops.md b/Docs/Layers/transit_stops.md index 0ef63ac19..571495104 100644 --- a/Docs/Layers/transit_stops.md +++ b/Docs/Layers/transit_stops.md @@ -102,7 +102,7 @@ This is rendered with `This stop is called {name}` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md index 0c38205f9..16bec09ef 100644 --- a/Docs/Layers/tree_node.md +++ b/Docs/Layers/tree_node.md @@ -84,7 +84,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/vending_machine.md b/Docs/Layers/vending_machine.md index 6cb9c95c3..122662546 100644 --- a/Docs/Layers/vending_machine.md +++ b/Docs/Layers/vending_machine.md @@ -25,6 +25,7 @@ Layer showing vending machines + - [personal](https://mapcomplete.osm.be/personal) - [vending_machine](https://mapcomplete.osm.be/vending_machine) @@ -80,7 +81,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only @@ -191,7 +192,7 @@ The question is *What coins can you use to pay here?* - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR` @@ -214,7 +215,7 @@ The question is *what notes can you use to pay here?* - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR` diff --git a/Docs/Layers/viewpoint.md b/Docs/Layers/viewpoint.md index a362dea40..1ef9519b5 100644 --- a/Docs/Layers/viewpoint.md +++ b/Docs/Layers/viewpoint.md @@ -63,7 +63,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/village_green.md b/Docs/Layers/village_green.md index cc619d182..2d130bc23 100644 --- a/Docs/Layers/village_green.md +++ b/Docs/Layers/village_green.md @@ -62,7 +62,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/waste_basket.md b/Docs/Layers/waste_basket.md index 92d1b780c..2d66b423b 100644 --- a/Docs/Layers/waste_basket.md +++ b/Docs/Layers/waste_basket.md @@ -78,7 +78,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md index d2cab62aa..56f6b8196 100644 --- a/Docs/Layers/waste_disposal.md +++ b/Docs/Layers/waste_disposal.md @@ -77,7 +77,7 @@ This tagrendering is only visible in the popup if the following condition is met -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/Layers/windturbine.md b/Docs/Layers/windturbine.md index c924936dc..ad3dc9717 100644 --- a/Docs/Layers/windturbine.md +++ b/Docs/Layers/windturbine.md @@ -164,7 +164,7 @@ This is rendered with `Extra information for OpenStreetMap experts: {fixme}` -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images This tagrendering has no question and is thus read-only diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md index f9c1aa643..21f47bc7d 100644 --- a/Docs/SpecialInputElements.md +++ b/Docs/SpecialInputElements.md @@ -259,4 +259,4 @@ postfix | Piece of text that will always be added to the end of the generated op Shows a color picker -This document is autogenerated from [UI/InputElement/Validators.ts](https://github.com/pietervdvn/MapComplete/blob/develop/UI/InputElement/Validators.ts) +This document is autogenerated from [src/UI/InputElement/Validators.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/UI/InputElement/Validators.ts) diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md index e512a9559..8ca7ded54 100644 --- a/Docs/SpecialRenderings.md +++ b/Docs/SpecialRenderings.md @@ -1047,4 +1047,4 @@ icon | ./assets/svg/robot.svg | The icon to show on the button `{auto_apply(,,,,./assets/svg/robot.svg)}` -This document is autogenerated from [UI/SpecialVisualizations.ts](https://github.com/pietervdvn/MapComplete/blob/develop/UI/SpecialVisualizations.ts) +This document is autogenerated from [src/UI/SpecialVisualizations.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/UI/SpecialVisualizations.ts) diff --git a/Docs/TagInfo/mapcomplete_artwork.json b/Docs/TagInfo/mapcomplete_artwork.json index 2a297640c..b8020b0de 100644 --- a/Docs/TagInfo/mapcomplete_artwork.json +++ b/Docs/TagInfo/mapcomplete_artwork.json @@ -142,6 +142,155 @@ "key": "amenity", "description": "Layer 'Artworks' shows with a fixed text, namely 'This artwork does not serve as a bench' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') Picking this answer will delete the key amenity.", "value": "" + }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=yes&two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "two_sided", + "description": "Layer 'Artworks' shows backrest=yes&two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=yes with a fixed text, namely 'Does have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=no with a fixed text, namely 'Does not have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "no" + }, + { + "key": "seats", + "description": "Layer 'Artworks' shows and asks freeform values for key 'seats' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "seats:separated", + "description": "Layer 'Artworks' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "no" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=wood with a fixed text, namely 'The seating is made from wood' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "wood" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=metal with a fixed text, namely 'The seating is made from metal' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "metal" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=stone with a fixed text, namely 'The seating is made from stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "stone" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=concrete with a fixed text, namely 'The seating is made from concrete' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "concrete" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=plastic with a fixed text, namely 'The seating is made from plastic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "plastic" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=steel with a fixed text, namely 'The seating is made from steel' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "steel" + }, + { + "key": "direction", + "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows and asks freeform values for key 'colour' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "brown" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "green" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "gray" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "white" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "red" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "black" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "blue" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "yellow" + }, + { + "key": "survey:date", + "description": "Layer 'Artworks' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "survey:date", + "description": "Layer 'Artworks' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') Picking this answer will delete the key survey:date. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "inscription", + "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)" + }, + { + "key": "not:inscription", + "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "inscription", + "description": "Layer 'Artworks' shows with a fixed text, namely 'This bench does (probably) not have an inscription' (in the MapComplete.osm.be theme 'Artwork') Picking this answer will delete the key inscription. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "historic", + "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "memorial" + }, + { + "key": "historic", + "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "not:historic", + "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Artwork') (This is only shown if amenity=bench)", + "value": "memorial" } ] } \ No newline at end of file diff --git a/Docs/TagInfo/mapcomplete_benches.json b/Docs/TagInfo/mapcomplete_benches.json index e977d3fce..110552067 100644 --- a/Docs/TagInfo/mapcomplete_benches.json +++ b/Docs/TagInfo/mapcomplete_benches.json @@ -267,6 +267,91 @@ "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if historic=memorial|inscription~.+|memorial=bench|tourism=artwork)", "value": "memorial" }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows and asks freeform values for key 'artwork_type' (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=architecture with a fixed text, namely 'Architecture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "architecture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=mural with a fixed text, namely 'Mural' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "mural" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=painting with a fixed text, namely 'Painting' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "painting" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=sculpture with a fixed text, namely 'Sculpture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "sculpture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=statue with a fixed text, namely 'Statue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "statue" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=bust with a fixed text, namely 'Bust' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "bust" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=stone with a fixed text, namely 'Stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "stone" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=installation with a fixed text, namely 'Installation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "installation" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=graffiti with a fixed text, namely 'Graffiti' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "graffiti" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=relief with a fixed text, namely 'Relief' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "relief" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=azulejo with a fixed text, namely 'Azulejo (Spanish decorative tilework)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "azulejo" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "tilework" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)", + "value": "woodcarving" + }, + { + "key": "artist:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist:wikidata' (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)" + }, + { + "key": "artist_name", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist_name' (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)" + }, + { + "key": "website", + "description": "Layer 'Benches' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)" + }, + { + "key": "subject:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Benches') (This is only shown if tourism=artwork)" + }, { "key": "highway", "description": "The MapComplete theme Benches has a layer Benches at public transport stops showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json index d2674c0b4..bd3f7f2a1 100644 --- a/Docs/TagInfo/mapcomplete_climbing.json +++ b/Docs/TagInfo/mapcomplete_climbing.json @@ -151,6 +151,25 @@ "key": "contact:email", "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '{contact:email}' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" }, + { + "key": "charge", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "fee", + "description": "Layer 'Climbing gyms' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "charge", + "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key charge.", + "value": "" + }, { "key": "payment:cash", "description": "Layer 'Climbing gyms' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", @@ -296,6 +315,69 @@ "description": "Layer 'Climbing gyms' shows service:climbing_rope:rental=no with a fixed text, namely 'A climbing rope can not be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no)", "value": "no" }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "limited" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope~.+ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "climbing:length", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no|climbing:toprope!=no)" + }, + { + "key": "climbing:grade:french:min", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "climbing:grade:french:max", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if climbing!~^(route)$&climbing:sport=yes|sport=climbing)" + }, + { + "key": "climbing:bolts:max", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:bolts:max' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no)" + }, { "key": "climbing:speed", "description": "Layer 'Climbing gyms' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", @@ -540,6 +622,48 @@ "description": "Layer 'Climbing opportunities' shows rock=limestone with a fixed text, namely 'Limestone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if climbing=crag|natural=cliff|natural=bare_rock)", "value": "limestone" }, + { + "key": "url", + "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if leisure!~^(sports_centre)$&sport=climbing)" + }, + { + "key": "charge", + "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "fee", + "description": "Layer 'Climbing opportunities' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "charge", + "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key charge.", + "value": "" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "no" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')", + "value": "limited" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots')" + }, { "key": "access", "description": "Layer 'Climbing opportunities' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Climbing gyms, clubs and spots') (This is only shown if access~.+|)", diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index d89c85fed..70b68b9bd 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -258,6 +258,78 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists')", "value": "no" }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "city_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "ebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "bmx" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "mtb" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "kid_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "tandem" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "racebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "bike_helmet" + }, + { + "key": "capacity:city_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:ebike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:kid_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bmx", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:mtb", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bicycle_pannier", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:tandem_bicycle", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)" + }, { "key": "service:bicycle:second_hand", "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists')", @@ -318,6 +390,25 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists')", "value": "no" }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "no" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "yes" + }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "" + }, { "key": "description", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Cyclofix - a map for cyclists')" diff --git a/Docs/TagInfo/mapcomplete_education.json b/Docs/TagInfo/mapcomplete_education.json index 861b383c7..403458e4d 100644 --- a/Docs/TagInfo/mapcomplete_education.json +++ b/Docs/TagInfo/mapcomplete_education.json @@ -62,6 +62,30 @@ "description": "Layer 'Colleges and universities' shows isced:2011:level=doctorate with a fixed text, namely 'Doctorate degrees are awarded here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Education') (This is only shown if amenity=university)", "value": "doctorate" }, + { + "key": "capacity", + "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'capacity' (in the MapComplete.osm.be theme 'Education')" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=mixed with a fixed text, namely 'Both boys and girls can enroll here and have classes together' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Education')", + "value": "mixed" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=separated with a fixed text, namely 'Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Education')", + "value": "separated" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=male with a fixed text, namely 'This is a boys only-school' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Education')", + "value": "male" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=female with a fixed text, namely 'This is a girls-only school' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Education')", + "value": "female" + }, { "key": "website", "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Education')" diff --git a/Docs/TagInfo/mapcomplete_elongated_coin.json b/Docs/TagInfo/mapcomplete_elongated_coin.json new file mode 100644 index 000000000..aa7f52afb --- /dev/null +++ b/Docs/TagInfo/mapcomplete_elongated_coin.json @@ -0,0 +1,207 @@ +{ + "data_format": 1, + "project": { + "name": "MapComplete Penny Presses", + "description": "Find penny presses to create your own elongated coins", + "project_url": "https://mapcomplete.osm.be/elongated_coin", + "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/", + "icon_url": "https://mapcomplete.osm.be/assets/themes/elongated_coin/penny.svg", + "contact_name": "Pieter Vander Vennet", + "contact_email": "pietervdvn@posteo.net" + }, + "tags": [ + { + "key": "amenity", + "description": "The MapComplete theme Penny Presses has a layer Penny Presses showing features with this tag", + "value": "vending_machine" + }, + { + "key": "vending", + "description": "The MapComplete theme Penny Presses has a layer Penny Presses showing features with this tag", + "value": "elongated_coin" + }, + { + "key": "id", + "description": "Layer 'Penny Presses' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)" + }, + { + "key": "image", + "description": "The layer 'Penny Presses allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Penny Presses allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Penny Presses allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Penny Presses allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "opening_hours", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "opening_hours", + "description": "Layer 'Penny Presses' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "24/7" + }, + { + "key": "coin:design_count", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'coin:design_count' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "coin:design_count", + "description": "Layer 'Penny Presses' shows coin:design_count=1 with a fixed text, namely 'This penny press has one design available.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "1" + }, + { + "key": "coin:design_count", + "description": "Layer 'Penny Presses' shows coin:design_count=2 with a fixed text, namely 'This penny press has two designs available.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "2" + }, + { + "key": "coin:design_count", + "description": "Layer 'Penny Presses' shows coin:design_count=3 with a fixed text, namely 'This penny press has three designs available.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "3" + }, + { + "key": "coin:design_count", + "description": "Layer 'Penny Presses' shows coin:design_count=4 with a fixed text, namely 'This penny press has four designs available.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "4" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'coin:type' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows coin:type=2cent with a fixed text, namely 'This penny press uses a 2 cent coin for pressing.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "2cent" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows coin:type=5cent with a fixed text, namely 'This penny press uses a 5 cent coin for pressing.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "5cent" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows coin:type=10cent with a fixed text, namely 'This penny press uses a 10 cent coin for pressing.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "10cent" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows coin:type=25cent with a fixed text, namely 'This penny press uses a 25 cent coin for pressing.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "25cent" + }, + { + "key": "coin:type", + "description": "Layer 'Penny Presses' shows coin:type=50cent with a fixed text, namely 'This penny press uses a 50 cent coin for pressing.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "50cent" + }, + { + "key": "website", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "contact:website", + "description": "Layer 'Penny Presses' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "charge", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "charge", + "description": "Layer 'Penny Presses' shows charge=1 EUR with a fixed text, namely 'It costs 1 euro to press a penny.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "1 EUR" + }, + { + "key": "charge", + "description": "Layer 'Penny Presses' shows charge=2 EUR with a fixed text, namely 'It costs 2 euros to press a penny.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "2 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.01 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.02 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.05 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.10 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.20 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.50 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "1 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "2 EUR" + }, + { + "key": "indoor", + "description": "Layer 'Penny Presses' shows indoor=yes with a fixed text, namely 'This penny press is located indoors.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "yes" + }, + { + "key": "indoor", + "description": "Layer 'Penny Presses' shows indoor=no with a fixed text, namely 'This penny press is located outdoors.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "no" + }, + { + "key": "level", + "description": "Layer 'Penny Presses' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Penny Presses')" + }, + { + "key": "location", + "description": "Layer 'Penny Presses' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "underground" + }, + { + "key": "level", + "description": "Layer 'Penny Presses' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "0" + }, + { + "key": "level", + "description": "Layer 'Penny Presses' shows with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Penny Presses') Picking this answer will delete the key level.", + "value": "" + }, + { + "key": "level", + "description": "Layer 'Penny Presses' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "1" + }, + { + "key": "level", + "description": "Layer 'Penny Presses' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Penny Presses')", + "value": "-1" + } + ] +} \ No newline at end of file diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json index 03b714797..2e43f8d32 100644 --- a/Docs/TagInfo/mapcomplete_healthcare.json +++ b/Docs/TagInfo/mapcomplete_healthcare.json @@ -404,6 +404,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Healthcare')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')" @@ -603,6 +1407,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Healthcare')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')" diff --git a/Docs/TagInfo/mapcomplete_maps.json b/Docs/TagInfo/mapcomplete_maps.json index e50e20e3c..26c8e5e70 100644 --- a/Docs/TagInfo/mapcomplete_maps.json +++ b/Docs/TagInfo/mapcomplete_maps.json @@ -77,7 +77,7 @@ }, { "key": "map_size", - "description": "Layer 'Maps' shows map_size=city with a fixed text, namely ' A map of a city.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps')", + "description": "Layer 'Maps' shows map_size=city with a fixed text, namely ' A map of a city' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps')", "value": "city" }, { diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json index f6941c71d..37a5e2bb9 100644 --- a/Docs/TagInfo/mapcomplete_nature.json +++ b/Docs/TagInfo/mapcomplete_nature.json @@ -432,7 +432,7 @@ }, { "key": "map_size", - "description": "Layer 'Maps' shows map_size=city with a fixed text, namely ' A map of a city.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')", + "description": "Layer 'Maps' shows map_size=city with a fixed text, namely ' A map of a city' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')", "value": "city" }, { @@ -688,6 +688,91 @@ "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if historic=memorial|inscription~.+|memorial=bench|tourism=artwork)", "value": "memorial" }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows and asks freeform values for key 'artwork_type' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=architecture with a fixed text, namely 'Architecture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "architecture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=mural with a fixed text, namely 'Mural' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "mural" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=painting with a fixed text, namely 'Painting' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "painting" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=sculpture with a fixed text, namely 'Sculpture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "sculpture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=statue with a fixed text, namely 'Statue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "statue" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=bust with a fixed text, namely 'Bust' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "bust" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=stone with a fixed text, namely 'Stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "stone" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=installation with a fixed text, namely 'Installation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "installation" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=graffiti with a fixed text, namely 'Graffiti' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "graffiti" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=relief with a fixed text, namely 'Relief' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "relief" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=azulejo with a fixed text, namely 'Azulejo (Spanish decorative tilework)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "azulejo" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "tilework" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)", + "value": "woodcarving" + }, + { + "key": "artist:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist:wikidata' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)" + }, + { + "key": "artist_name", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist_name' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)" + }, + { + "key": "website", + "description": "Layer 'Benches' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)" + }, + { + "key": "subject:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if tourism=artwork)" + }, { "key": "leisure", "description": "The MapComplete theme Into nature has a layer Picnic tables showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json index 17d7f8182..aca7e1d67 100644 --- a/Docs/TagInfo/mapcomplete_onwheels.json +++ b/Docs/TagInfo/mapcomplete_onwheels.json @@ -1278,6 +1278,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'OnWheels')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'OnWheels')" diff --git a/Docs/TagInfo/mapcomplete_parkings.json b/Docs/TagInfo/mapcomplete_parkings.json index 6de8785b5..61e386bbe 100644 --- a/Docs/TagInfo/mapcomplete_parkings.json +++ b/Docs/TagInfo/mapcomplete_parkings.json @@ -309,77 +309,77 @@ }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.01 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.02 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.05 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.10 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.20 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.50 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "1 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "2 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "5 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "10 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "20 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "50 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "100 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "200 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "500 EUR" }, { diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 39babba65..77589487f 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -419,6 +419,155 @@ "description": "Layer 'Artworks' shows with a fixed text, namely 'This artwork does not serve as a bench' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key amenity.", "value": "" }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=yes&two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "two_sided", + "description": "Layer 'Artworks' shows backrest=yes&two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=yes with a fixed text, namely 'Does have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "backrest", + "description": "Layer 'Artworks' shows backrest=no with a fixed text, namely 'Does not have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "no" + }, + { + "key": "seats", + "description": "Layer 'Artworks' shows and asks freeform values for key 'seats' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "seats:separated", + "description": "Layer 'Artworks' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "no" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=wood with a fixed text, namely 'The seating is made from wood' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "wood" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=metal with a fixed text, namely 'The seating is made from metal' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "metal" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=stone with a fixed text, namely 'The seating is made from stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "stone" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=concrete with a fixed text, namely 'The seating is made from concrete' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "concrete" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=plastic with a fixed text, namely 'The seating is made from plastic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "plastic" + }, + { + "key": "material", + "description": "Layer 'Artworks' shows material=steel with a fixed text, namely 'The seating is made from steel' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "steel" + }, + { + "key": "direction", + "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows and asks freeform values for key 'colour' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "brown" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "green" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "gray" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "white" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "red" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "black" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "blue" + }, + { + "key": "colour", + "description": "Layer 'Artworks' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "yellow" + }, + { + "key": "survey:date", + "description": "Layer 'Artworks' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "survey:date", + "description": "Layer 'Artworks' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key survey:date. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "inscription", + "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)" + }, + { + "key": "not:inscription", + "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "yes" + }, + { + "key": "inscription", + "description": "Layer 'Artworks' shows with a fixed text, namely 'This bench does (probably) not have an inscription' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key inscription. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "historic", + "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "memorial" + }, + { + "key": "historic", + "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key historic. (This is only shown if amenity=bench)", + "value": "" + }, + { + "key": "not:historic", + "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bench)", + "value": "memorial" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer ATMs showing features with this tag", @@ -850,6 +999,91 @@ "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a not a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if historic=memorial|inscription~.+|memorial=bench|tourism=artwork)", "value": "memorial" }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows and asks freeform values for key 'artwork_type' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=architecture with a fixed text, namely 'Architecture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "architecture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=mural with a fixed text, namely 'Mural' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "mural" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=painting with a fixed text, namely 'Painting' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "painting" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=sculpture with a fixed text, namely 'Sculpture' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "sculpture" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=statue with a fixed text, namely 'Statue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "statue" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=bust with a fixed text, namely 'Bust' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "bust" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=stone with a fixed text, namely 'Stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "stone" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=installation with a fixed text, namely 'Installation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "installation" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=graffiti with a fixed text, namely 'Graffiti' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "graffiti" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=relief with a fixed text, namely 'Relief' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "relief" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=azulejo with a fixed text, namely 'Azulejo (Spanish decorative tilework)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "azulejo" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "tilework" + }, + { + "key": "artwork_type", + "description": "Layer 'Benches' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)", + "value": "woodcarving" + }, + { + "key": "artist:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist:wikidata' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)" + }, + { + "key": "artist_name", + "description": "Layer 'Benches' shows and asks freeform values for key 'artist_name' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)" + }, + { + "key": "website", + "description": "Layer 'Benches' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)" + }, + { + "key": "subject:wikidata", + "description": "Layer 'Benches' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if tourism=artwork)" + }, { "key": "highway", "description": "The MapComplete theme Personal theme has a layer Benches at public transport stops showing features with this tag", @@ -2008,6 +2242,78 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "no" }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "city_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "ebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "bmx" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "mtb" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "kid_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "tandem" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "racebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", + "value": "bike_helmet" + }, + { + "key": "capacity:city_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:ebike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:kid_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bmx", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:mtb", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bicycle_pannier", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:tandem_bicycle", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)" + }, { "key": "service:bicycle:second_hand", "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -2068,6 +2374,25 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "no" }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "no" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "yes" + }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "" + }, { "key": "description", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Personal theme')" @@ -3931,6 +4256,48 @@ "description": "Layer 'Climbing opportunities' shows rock=limestone with a fixed text, namely 'Limestone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if climbing=crag|natural=cliff|natural=bare_rock)", "value": "limestone" }, + { + "key": "url", + "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if leisure!~^(sports_centre)$&sport=climbing)" + }, + { + "key": "charge", + "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "fee", + "description": "Layer 'Climbing opportunities' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "charge", + "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key charge.", + "value": "" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "limited" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "club", "description": "The MapComplete theme Personal theme has a layer Climbing club showing features with this tag", @@ -4043,6 +4410,25 @@ "key": "contact:email", "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '{contact:email}' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "charge", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "fee", + "description": "Layer 'Climbing gyms' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "charge", + "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key charge.", + "value": "" + }, { "key": "payment:cash", "description": "Layer 'Climbing gyms' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -4188,6 +4574,69 @@ "description": "Layer 'Climbing gyms' shows service:climbing_rope:rental=no with a fixed text, namely 'A climbing rope can not be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if climbing:sport!=no)", "value": "no" }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "limited" + }, + { + "key": "climbing:boulder", + "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "climbing:sport", + "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "climbing:toprope", + "description": "Layer 'Climbing gyms' shows climbing:toprope~.+ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "climbing:length", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if climbing:sport!=no|climbing:toprope!=no)" + }, + { + "key": "climbing:grade:french:min", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "climbing:grade:french:max", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if climbing!~^(route)$&climbing:sport=yes|sport=climbing)" + }, + { + "key": "climbing:bolts:max", + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:bolts:max' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if climbing:sport!=no)" + }, { "key": "climbing:speed", "description": "Layer 'Climbing gyms' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -7018,9 +7467,13 @@ "key": "wikipedia", "description": "The layer 'Ghost bikes allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" }, + { + "key": "subject", + "description": "Layer 'Ghost bikes' shows and asks freeform values for key 'subject' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "name", - "description": "Layer 'Ghost bikes' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')" + "description": "Layer 'Ghost bikes' shows name~.+ with a fixed text, namely 'In remembrance of {name}' (in the MapComplete.osm.be theme 'Personal theme')" }, { "key": "noname", @@ -7801,6 +8254,51 @@ "key": "wikipedia", "description": "The layer 'Maps allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" }, + { + "key": "map_type", + "description": "Layer 'Maps' shows map_type=topo with a fixed text, namely 'Topographical map

The map contains contour lines.

' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "topo" + }, + { + "key": "map_type", + "description": "Layer 'Maps' shows map_type=street with a fixed text, namely 'A map with all streets or ways of an area.

The streets are mostly named; the angles, distances etc. are accurate

' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "street" + }, + { + "key": "map_type", + "description": "Layer 'Maps' shows map_type=scheme with a fixed text, namely 'This is a schematic map.

A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.

' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "scheme" + }, + { + "key": "map_type", + "description": "Layer 'Maps' shows map_type=toposcope with a fixed text, namely 'This is a toposcope.

A marker erected on high places which indicates the direction to notable landscape features which can be seen from that point

' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "toposcope" + }, + { + "key": "map_size", + "description": "Layer 'Maps' shows map_size=building with a fixed text, namely 'A map of the rooms within a building' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "building" + }, + { + "key": "map_size", + "description": "Layer 'Maps' shows map_size=site with a fixed text, namely 'A map of special site, like of a historical castle, a park, a campus, a forest, ....' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "site" + }, + { + "key": "map_size", + "description": "Layer 'Maps' shows map_size=village with a fixed text, namely 'A map showing the village or town' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "village" + }, + { + "key": "map_size", + "description": "Layer 'Maps' shows map_size=city with a fixed text, namely ' A map of a city' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "city" + }, + { + "key": "map_size", + "description": "Layer 'Maps' shows map_size=region with a fixed text, namely 'The map of an entire region, showing multiple cities and villages' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "region" + }, { "key": "map_source", "description": "Layer 'Maps' shows and asks freeform values for key 'map_source' (in the MapComplete.osm.be theme 'Personal theme')" @@ -8641,77 +9139,77 @@ }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.01 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.02 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.05 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.10 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.20 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.50 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "1 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "2 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "5 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "10 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "20 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "50 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "100 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "200 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "500 EUR" }, { @@ -10010,6 +10508,16 @@ "key": "shop", "description": "The MapComplete theme Personal theme has a layer Shop showing features with this tag" }, + { + "key": "craft", + "description": "The MapComplete theme Personal theme has a layer Shop showing features with this tag", + "value": "shoe_repair" + }, + { + "key": "craft", + "description": "The MapComplete theme Personal theme has a layer Shop showing features with this tag", + "value": "key_cutter" + }, { "key": "id", "description": "Layer 'Shop' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)" @@ -10034,6 +10542,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" @@ -11140,6 +12452,30 @@ "description": "Layer 'Colleges and universities' shows isced:2011:level=doctorate with a fixed text, namely 'Doctorate degrees are awarded here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=university)", "value": "doctorate" }, + { + "key": "capacity", + "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'capacity' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=mixed with a fixed text, namely 'Both boys and girls can enroll here and have classes together' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "mixed" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=separated with a fixed text, namely 'Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "separated" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=male with a fixed text, namely 'This is a boys only-school' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "male" + }, + { + "key": "school:gender", + "description": "Layer 'Colleges and universities' shows school:gender=female with a fixed text, namely 'This is a girls-only school' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "female" + }, { "key": "website", "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')" @@ -11522,6 +12858,80 @@ "key": "toilets:door:width", "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:door:width' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if toilets:wheelchair=yes|toilets:wheelchair=designated)" }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "seated" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "urinal" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "squat" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "seated;urinal" + }, + { + "key": "changing_table", + "description": "Layer 'Toilets at other amenities' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "changing_table", + "description": "Layer 'Toilets at other amenities' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'changing_table:location' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if changing_table=yes)" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if changing_table=yes)", + "value": "female_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if changing_table=yes)", + "value": "male_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if changing_table=yes)", + "value": "wheelchair_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if changing_table=yes)", + "value": "dedicated_room" + }, + { + "key": "toilets:handwashing", + "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "toilets:handwashing", + "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "toilets:paper_supplied", + "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if toilets:position!=urinal)", + "value": "yes" + }, + { + "key": "toilets:paper_supplied", + "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if toilets:position!=urinal)", + "value": "no" + }, { "key": "toilets:description", "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:description' (in the MapComplete.osm.be theme 'Personal theme')" @@ -11890,6 +13300,282 @@ "key": "wikidata", "description": "Layer 'Tree' shows and asks freeform values for key 'wikidata' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if denotation=landmark|denotation=natural_monument|wikidata~.+)" }, + { + "key": "amenity", + "description": "The MapComplete theme Personal theme has a layer Vending Machines showing features with this tag", + "value": "vending_machine" + }, + { + "key": "id", + "description": "Layer 'Vending Machines' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)" + }, + { + "key": "image", + "description": "The layer 'Vending Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Vending Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Vending Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Vending Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'vending' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=drinks with a fixed text, namely 'Drinks are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "drinks" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=sweets with a fixed text, namely 'Sweets are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "sweets" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=food with a fixed text, namely 'Food is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "food" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=cigarettes with a fixed text, namely 'Cigarettes are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "cigarettes" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=condoms with a fixed text, namely 'Condoms are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "condoms" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=coffee with a fixed text, namely 'Coffee is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "coffee" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=water with a fixed text, namely 'Drinking water is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "water" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=newspapers with a fixed text, namely 'Newspapers are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "newspapers" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=bicycle_tube with a fixed text, namely 'Bicycle inner tubes are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bicycle_tube" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=milk with a fixed text, namely 'Milk is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "milk" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=bread with a fixed text, namely 'Bread is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "bread" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=eggs with a fixed text, namely 'Eggs are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "eggs" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=cheese with a fixed text, namely 'Cheese is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "cheese" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=honey with a fixed text, namely 'Honey is sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "honey" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=potatoes with a fixed text, namely 'Potatoes are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "potatoes" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=flowers with a fixed text, namely 'Flowers are sold' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "flowers" + }, + { + "key": "opening_hours", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "opening_hours", + "description": "Layer 'Vending Machines' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "24/7" + }, + { + "key": "payment:cash", + "description": "Layer 'Vending Machines' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:cards", + "description": "Layer 'Vending Machines' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:qr_code", + "description": "Layer 'Vending Machines' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:coins", + "description": "Layer 'Vending Machines' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:notes", + "description": "Layer 'Vending Machines' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:debit_cards", + "description": "Layer 'Vending Machines' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:credit_cards", + "description": "Layer 'Vending Machines' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.01 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.02 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.05 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.10 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.20 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "0.50 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "1 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", + "value": "2 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "5 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "10 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "20 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "50 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "100 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "200 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", + "value": "500 EUR" + }, + { + "key": "operator", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'operator' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "indoor", + "description": "Layer 'Vending Machines' shows with a fixed text, namely 'This vending machine is outdoors' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key indoor.", + "value": "" + }, + { + "key": "indoor", + "description": "Layer 'Vending Machines' shows indoor=yes with a fixed text, namely 'This vending machine is indoors' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "indoor", + "description": "Layer 'Vending Machines' shows indoor=no with a fixed text, namely 'This vending machine is outdoors' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "level", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "location", + "description": "Layer 'Vending Machines' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "underground" + }, + { + "key": "level", + "description": "Layer 'Vending Machines' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "0" + }, + { + "key": "level", + "description": "Layer 'Vending Machines' shows with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key level.", + "value": "" + }, + { + "key": "level", + "description": "Layer 'Vending Machines' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "1" + }, + { + "key": "level", + "description": "Layer 'Vending Machines' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "-1" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer veterinary showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json index 0b9ba9924..5ccde082c 100644 --- a/Docs/TagInfo/mapcomplete_pets.json +++ b/Docs/TagInfo/mapcomplete_pets.json @@ -621,6 +621,810 @@ "key": "name", "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')" }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Dog-friendly shops' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')" diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json index 3d3ebae7b..c87a8ed73 100644 --- a/Docs/TagInfo/mapcomplete_shops.json +++ b/Docs/TagInfo/mapcomplete_shops.json @@ -48,6 +48,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Shops')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Shops')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Shops')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Shops')" diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json index fd0b550f2..02d8f7650 100644 --- a/Docs/TagInfo/mapcomplete_sports.json +++ b/Docs/TagInfo/mapcomplete_sports.json @@ -574,6 +574,810 @@ "key": "name", "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Sports')" }, + { + "key": "shop", + "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the MapComplete.osm.be theme 'Sports')" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "agrarian" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "alcohol" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "anime" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antiques Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "antiques" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "appliance" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "art" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "baby_goods" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bag" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bakery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bathroom_furnishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "beauty" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bed" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "beverages" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bicycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "boat" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "bookmaker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Book Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "books" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "brewing_supplies" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "butcher" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "camera" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "candles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "cannabis" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "car" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "car_parts" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "car_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "caravan" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "carpet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "catalogue" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "charity" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "cheese" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "chemist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "chocolate" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "clothes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "coffee" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "collector" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "computer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "confectionery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "convenience" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "copyshop" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "cosmetics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Country Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "country_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "craft" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "curtain" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "dairy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Deli' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "deli" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "department_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "doityourself" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "doors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "dry_cleaning" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "e-cigarette" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "electrical" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "electronics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "erotic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "fabric" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "farm" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "fashion_accessories" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "fireplace" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "fishing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "flooring" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "florist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "frame" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "frozen_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "fuel" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "funeral_directors" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "furniture" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "garden_centre" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "gas" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "general" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "gift" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "greengrocer" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hairdresser" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hairdresser_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hardware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "health_food" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hearing_aids" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "herbalist" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hifi" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hobby with a fixed text, namely 'Hobby Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hobby" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "household_linen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "houseware" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "hunting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "interior_decoration" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "jewelry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "kiosk" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "kitchen" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "laundry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "leather" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "lighting" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "locksmith" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "lottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "mall" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "massage" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "medical_supply" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "military_surplus" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "mobile_phone" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "model" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "money_lender" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "motorcycle" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "motorcycle_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "music" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "musical_instrument" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newspaper/Magazine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "newsagent" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "nutrition_supplements" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "optician" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "outdoor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "outpost" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "paint" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "party" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pastry" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawn Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pawnbroker" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "perfumery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pet" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Grooming Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pet_grooming" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "photo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pottery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "printer_ink" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "psychic" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "pyrotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "radiotechnics" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "religion" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "scuba_diving" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "seafood" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Consignment/Thrift Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "second_hand" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "sewing" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "shoe_repair" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "shoes" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "spices" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "stationery" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "storage_rental" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "supermarket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "swimming_pool" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tailor" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tattoo" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tea" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "telecommunication" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "ticket" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tiles" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tobacco" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tool_hire" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "toys" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "trade" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "travel_agency" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "trophy" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "tyres" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "vacuum_cleaner" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Variety Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "variety_store" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "video" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "video_games" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "watches" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "water" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "water_sports" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "weapons" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "wholesale" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "wigs" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "window_blind" + }, + { + "key": "shop", + "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "wine" + }, { "key": "opening_hours", "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Sports')" diff --git a/Docs/TagInfo/mapcomplete_toilets.json b/Docs/TagInfo/mapcomplete_toilets.json index 0c6ab45d5..b5a7a7c00 100644 --- a/Docs/TagInfo/mapcomplete_toilets.json +++ b/Docs/TagInfo/mapcomplete_toilets.json @@ -368,6 +368,80 @@ "key": "toilets:door:width", "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:door:width' (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if toilets:wheelchair=yes|toilets:wheelchair=designated)" }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "seated" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "urinal" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "squat" + }, + { + "key": "toilets:position", + "description": "Layer 'Toilets at other amenities' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "seated;urinal" + }, + { + "key": "changing_table", + "description": "Layer 'Toilets at other amenities' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "yes" + }, + { + "key": "changing_table", + "description": "Layer 'Toilets at other amenities' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "no" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'changing_table:location' (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if changing_table=yes)" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if changing_table=yes)", + "value": "female_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if changing_table=yes)", + "value": "male_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if changing_table=yes)", + "value": "wheelchair_toilet" + }, + { + "key": "changing_table:location", + "description": "Layer 'Toilets at other amenities' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if changing_table=yes)", + "value": "dedicated_room" + }, + { + "key": "toilets:handwashing", + "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "yes" + }, + { + "key": "toilets:handwashing", + "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets')", + "value": "no" + }, + { + "key": "toilets:paper_supplied", + "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if toilets:position!=urinal)", + "value": "yes" + }, + { + "key": "toilets:paper_supplied", + "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Public toilets') (This is only shown if toilets:position!=urinal)", + "value": "no" + }, { "key": "toilets:description", "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:description' (in the MapComplete.osm.be theme 'Public toilets')" diff --git a/Docs/TagInfo/mapcomplete_vending_machine.json b/Docs/TagInfo/mapcomplete_vending_machine.json index ee9383952..bb9048360 100644 --- a/Docs/TagInfo/mapcomplete_vending_machine.json +++ b/Docs/TagInfo/mapcomplete_vending_machine.json @@ -165,77 +165,77 @@ }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.01 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.02 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.05 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.10 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.20 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "0.50 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "1 EUR" }, { "key": "payment:coins:denominations", - "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)", "value": "2 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "5 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "10 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "20 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "50 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "100 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "200 EUR" }, { "key": "payment:notes:denominations", - "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)", "value": "500 EUR" }, { diff --git a/Docs/Themes/mapcomplete-changes.md b/Docs/Themes/mapcomplete-changes.md index 260685ec9..3ec4b2938 100644 --- a/Docs/Themes/mapcomplete-changes.md +++ b/Docs/Themes/mapcomplete-changes.md @@ -27,8 +27,6 @@ Available languages: - en - - de - - nl This document is autogenerated from [assets/themes/mapcomplete-changes/mapcomplete-changes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/mapcomplete-changes/mapcomplete-changes.json) diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md index 9235359c8..aad9de5a7 100644 --- a/Docs/Themes/personal.md +++ b/Docs/Themes/personal.md @@ -104,6 +104,7 @@ This theme contains the following layers: - [transit_routes](../Layers/transit_routes.md) - [transit_stops](../Layers/transit_stops.md) - [tree_node](../Layers/tree_node.md) + - [vending_machine](../Layers/vending_machine.md) - [veterinary](../Layers/veterinary.md) - [walls_and_buildings](../Layers/walls_and_buildings.md) - [waste_basket](../Layers/waste_basket.md) diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md index bf0bb4a76..78a4cf329 100644 --- a/Docs/URL_Parameters.md +++ b/Docs/URL_Parameters.md @@ -67,12 +67,15 @@ Finally, the URL-hash is the part after the `#`. It is `node/1234` in this case. The language to display MapComplete in. The user display language is determined in the following order: -- If the user did log in and did set their language before with MapComplete, use this language -- If the user visited MapComplete before and did change their language, use the language as set by this URL-parameter. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language -- Use the navigator-language (if available) -- Use English + +1. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences. +2. Use the language as set by the URL-parameter `language`. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language +3. If the user visited MapComplete before and did change their language manually, this changed language will be saved in local storage. Use the language from local storage +4. Use the navigator-language (if available) +5. Use English Note that this URL-parameter is not added to the URL-bar by default. +Note that the _loading_ screen will always use the navigator language. Translations are never complete. If a translation in a certain language is missing, English is used as fallback. No default value set @@ -244,4 +247,4 @@ Translations are never complete. If a translation in a certain language is missi Wether or not the layer with id is shown The default value is _true_ -This document is autogenerated from [Logic/Web/QueryParameters.ts](https://github.com/pietervdvn/MapComplete/blob/develop/Logic/Web/QueryParameters.ts), [UI/QueryParameterDocumentation.ts](https://github.com/pietervdvn/MapComplete/blob/develop/UI/QueryParameterDocumentation.ts) +This document is autogenerated from [src/Logic/Web/QueryParameters.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Logic/Web/QueryParameters.ts), [src/UI/QueryParameterDocumentation.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/UI/QueryParameterDocumentation.ts) diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index b05d2ddcc..3611a1924 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -245,6 +245,15 @@ |genre= POI, editor, education }} {{service_item +|name= [https://mapcomplete.osm.be/elongated_coin elongated_coin] +|region= Worldwide +|lang= {{#language:en|en}} +|descr= A MapComplete theme: Find penny presses to create your own elongated coins +|material= {{yes|[https://mapcomplete.osm.be/ Yes]}} +|image= MapComplete_Screenshot.png +|genre= POI, editor, elongated_coin +}} +{{service_item |name= [https://mapcomplete.osm.be/facadegardens facadegardens] |region= Worldwide |lang= {{#language:nl|en}}, {{#language:en|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:it|en}}, {{#language:fr|en}}, {{#language:de|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:ca|en}} diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index dc837ebc1..56555e871 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "nl": "Toon wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -26,9 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "nl": "Centerpunt van changeset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -39,51 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung gemacht von {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?\"" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -92,27 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Sprache wurde diese Änderung vorgenommen?", - "nl": "In welke locale (taal) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Usersprache ist {locale}", - "nl": "De gebruikerstaal is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "de": "Änderung vorgenommen mit {host}", - "nl": "Wijziging gemaakt met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -133,12 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -480,9 +452,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themenaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -498,9 +468,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -516,9 +484,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -535,9 +501,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -554,9 +518,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -572,9 +534,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "nl": "De taal van de bijdrager is {search}" + "en": "User language (iso-code) {search}" } } ] @@ -590,9 +550,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -603,9 +561,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Changeset fügte mindestens ein Bild hinzu", - "nl": "Changeset bevat minstens één afbeelding" + "en": "Changeset added at least one image" } } ] @@ -620,8 +576,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier" + "en": "More statistics can be found here" } }, { diff --git a/scripts/generateDocs.ts b/scripts/generateDocs.ts index 2813d3a8a..a0ea6dd87 100644 --- a/scripts/generateDocs.ts +++ b/scripts/generateDocs.ts @@ -12,9 +12,9 @@ import ScriptUtils from "./ScriptUtils" import List from "../src/UI/Base/List" import SharedTagRenderings from "../src/Customizations/SharedTagRenderings" import Translations from "../src/UI/i18n/Translations" -import themeOverview from "../assets/generated/theme_overview.json" +import themeOverview from "../src/assets/generated/theme_overview.json" import LayoutConfig from "../src/Models/ThemeConfig/LayoutConfig" -import bookcases from "../assets/generated/themes/bookcases.json" +import bookcases from "../src/assets/generated/themes/bookcases.json" import fakedom from "fake-dom" import Hotkeys from "../src/UI/Base/Hotkeys" import { QueryParameters } from "../src/Logic/Web/QueryParameters" @@ -25,7 +25,8 @@ import DependencyCalculator from "../src/Models/ThemeConfig/DependencyCalculator import { AllSharedLayers } from "../src/Customizations/AllSharedLayers" import ThemeViewState from "../src/Models/ThemeViewState" import Validators from "../src/UI/InputElement/Validators" - +import questions from "../src/assets/generated/layers/questions.json" +import { LayerConfigJson } from "../src/Models/ThemeConfig/Json/LayerConfigJson" function WriteFile( filename, html: BaseUIElement, @@ -352,8 +353,9 @@ WriteFile("./Docs/SpecialInputElements.md", Validators.HelpText(), [ WriteFile("./Docs/BuiltinLayers.md", GenLayerOverviewText(), [ "src/Customizations/AllKnownLayouts.ts", ]) -WriteFile("./Docs/BuiltinQuestions.md", SharedTagRenderings.HelpText(), [ - "src/Customizations/SharedTagRenderings.ts", + +const qLayer = new LayerConfig(questions, "questions.json", true) +WriteFile("./Docs/BuiltinQuestions.md", qLayer.GenerateDocumentation([], new Map(), []), [ "assets/layers/questions/questions.json", ]) diff --git a/src/Customizations/SharedTagRenderings.ts b/src/Customizations/SharedTagRenderings.ts deleted file mode 100644 index dcd7e2bda..000000000 --- a/src/Customizations/SharedTagRenderings.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { Utils } from "../Utils" -import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig" -import { TagRenderingConfigJson } from "../Models/ThemeConfig/Json/TagRenderingConfigJson" -import BaseUIElement from "../UI/BaseUIElement" -import Combine from "../UI/Base/Combine" -import Title from "../UI/Base/Title" -import { FixedUiElement } from "../UI/Base/FixedUiElement" -import List from "../UI/Base/List" - -export default class SharedTagRenderings { - public static SharedTagRendering: Map = - SharedTagRenderings.generatedSharedFields() - public static SharedTagRenderingJson: Map = - SharedTagRenderings.generatedSharedFieldsJsons() - - private static generatedSharedFields(): Map { - const configJsons = SharedTagRenderings.generatedSharedFieldsJsons() - const d = new Map() - for (const key of Array.from(configJsons.keys())) { - try { - d.set( - key, - new TagRenderingConfig(configJsons.get(key), `SharedTagRenderings.${key}`) - ) - } catch (e) { - if (!Utils.runningFromConsole) { - console.error( - "BUG: could not parse", - key, - " from questions.json - this error happened during the build step of the SharedTagRenderings", - e - ) - } - } - } - return d - } - - private static generatedSharedFieldsJsons(): Map { - const dict = new Map() - - // TODO FIXME - - return dict - } - - public static HelpText(): BaseUIElement { - return new Combine([ - new Combine([ - new Title("Builtin questions", 1), - - "The following items can be easily reused in your layers", - ]).SetClass("flex flex-col"), - - ...Array.from(SharedTagRenderings.SharedTagRendering.keys()).map((key) => { - const tr = SharedTagRenderings.SharedTagRendering.get(key) - let mappings: BaseUIElement = undefined - if (tr.mappings?.length > 0) { - mappings = new List(tr.mappings.map((m) => m.then.textFor("en"))) - } - return new Combine([ - new Title(key), - tr.render?.textFor("en"), - tr.question?.textFor("en") ?? - new FixedUiElement("Read-only tagrendering").SetClass("font-bold"), - mappings, - ]).SetClass("flex flex-col") - }), - ]).SetClass("flex flex-col") - } -} diff --git a/src/Models/ThemeConfig/WithContextLoader.ts b/src/Models/ThemeConfig/WithContextLoader.ts index 7c04a2711..7b8349413 100644 --- a/src/Models/ThemeConfig/WithContextLoader.ts +++ b/src/Models/ThemeConfig/WithContextLoader.ts @@ -1,5 +1,4 @@ import TagRenderingConfig from "./TagRenderingConfig" -import SharedTagRenderings from "../../Customizations/SharedTagRenderings" import { TagRenderingConfigJson } from "./Json/TagRenderingConfigJson" export default class WithContextLoader { @@ -26,12 +25,6 @@ export default class WithContextLoader { `${translationContext ?? this._context}.${key}.default value` ) } - if (typeof v === "string") { - const shared = SharedTagRenderings.SharedTagRendering.get(v) - if (shared) { - return shared - } - } if (Object.keys(v).length === 1 && typeof v["render"] === "string") { throw `At ${ translationContext ?? "" diff --git a/src/UI/i18n/Locale.ts b/src/UI/i18n/Locale.ts index 93baa1d22..4112ef8a4 100644 --- a/src/UI/i18n/Locale.ts +++ b/src/UI/i18n/Locale.ts @@ -1,7 +1,7 @@ -import {UIEventSource} from "../../Logic/UIEventSource" -import {LocalStorageSource} from "../../Logic/Web/LocalStorageSource" -import {Utils} from "../../Utils" -import {QueryParameters} from "../../Logic/Web/QueryParameters" +import { UIEventSource } from "../../Logic/UIEventSource" +import { LocalStorageSource } from "../../Logic/Web/LocalStorageSource" +import { Utils } from "../../Utils" +import { QueryParameters } from "../../Logic/Web/QueryParameters" export default class Locale { public static showLinkToWeblate: UIEventSource = new UIEventSource(false) @@ -23,26 +23,33 @@ export default class Locale { * @private */ private static setup() { - let source: UIEventSource if (QueryParameters.wasInitialized("language") || Utils.runningFromConsole) { - if(!Utils.runningFromConsole){ - console.debug("Language was initialized via URL-parameter - using the URL parameter as store instead of local storage", QueryParameters.wasInitialized("language")) + if (!Utils.runningFromConsole) { + console.debug( + "Language was initialized via URL-parameter - using the URL parameter as store instead of local storage", + QueryParameters.wasInitialized("language") + ) } source = QueryParameters.GetQueryParameter( "language", undefined, - ["The language to display MapComplete in.", + [ + "The language to display MapComplete in.", "The user display language is determined in the following order:", - "- If the user did log in and did set their language before with MapComplete, use this language", - "- If the user visited MapComplete before and did change their language, use the language as set by this URL-parameter. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language", - "- Use the navigator-language (if available)", - "- Use English", + "", + "1. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences.", + "2. Use the language as set by the URL-parameter `language`. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language", + "3. If the user visited MapComplete before and did change their language manually, this changed language will be saved in local storage. Use the language from local storage", + "4. Use the navigator-language (if available)", + "5. Use English", "", "Note that this URL-parameter is not added to the URL-bar by default.", + "Note that the _loading_ screen will always use the navigator language.", "", - "Translations are never complete. If a translation in a certain language is missing, English is used as fallback."].join("\n"), + "Translations are never complete. If a translation in a certain language is missing, English is used as fallback.", + ].join("\n") ) } else { let browserLanguage = "en" From 7d687e62815f4302dcfeb25b44631d57417c64dc Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 20 Jul 2023 14:37:22 +0200 Subject: [PATCH 003/134] CI: update QodeQL --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 128e8530c..8c5368128 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -48,7 +48,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -62,4 +62,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From 22ee806090a8679ea2951d84af47e4de8314925c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 01:48:07 +0200 Subject: [PATCH 004/134] Fix: use translated value for community index tab --- langs/en.json | 2 +- src/UI/ThemeViewGUI.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/en.json b/langs/en.json index ae1d7e49d..f1f82f36b 100644 --- a/langs/en.json +++ b/langs/en.json @@ -14,7 +14,7 @@ "available": "This community speaks {native}", "intro": "Get in touch with other people to get to know them, learn from them, …", "notAvailable": "This community does not speak {native}", - "title": "Community index" + "title": "Get in touch with others", }, "delete": { "cancel": "Cancel", diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte index a74e57c7f..d8958034f 100644 --- a/src/UI/ThemeViewGUI.svelte +++ b/src/UI/ThemeViewGUI.svelte @@ -413,7 +413,7 @@

- Get in touch with others +
From 58f526734d6f85ba8fc49ccca2bd78eab2220414 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 01:48:54 +0200 Subject: [PATCH 005/134] Refactoring: fix imports of script --- scripts/generateImageAnalysis.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/generateImageAnalysis.ts b/scripts/generateImageAnalysis.ts index 7f4cf6bf8..d46671f9a 100644 --- a/scripts/generateImageAnalysis.ts +++ b/scripts/generateImageAnalysis.ts @@ -1,16 +1,15 @@ import Script from "./Script" -import { Overpass } from "../Logic/Osm/Overpass" -import { RegexTag } from "../Logic/Tags/RegexTag" -import { ImmutableStore } from "../Logic/UIEventSource" -import { BBox } from "../Logic/BBox" +import { Overpass } from "../src/Logic/Osm/Overpass" +import { RegexTag } from "../src/Logic/Tags/RegexTag" +import { ImmutableStore } from "../src/Logic/UIEventSource" +import { BBox } from "../src/Logic/BBox" import * as fs from "fs" import { Feature } from "geojson" import ScriptUtils from "./ScriptUtils" -import { Imgur } from "../Logic/ImageProviders/Imgur" -import { LicenseInfo } from "../Logic/ImageProviders/LicenseInfo" -import { Utils } from "../Utils" -import Constants from "../Models/Constants" -import { concat } from "svelte-preprocess/dist/modules/utils" +import { Imgur } from "../src/Logic/ImageProviders/Imgur" +import { LicenseInfo } from "../src/Logic/ImageProviders/LicenseInfo" +import { Utils } from "../src/Utils" +import Constants from "../src/Models/Constants" export default class GenerateImageAnalysis extends Script { constructor() { From 2f5c89f8c5a7aa7adbe83d1b9cf98e198f9f1aab Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 01:50:23 +0200 Subject: [PATCH 006/134] Fix: URL-parameter language disables the language picker, fix #1506 --- assets/layers/usersettings/usersettings.json | 11 ++++++++++- src/Logic/State/UserRelatedState.ts | 18 ++++++++++++++++-- src/Logic/Web/QueryParameters.ts | 4 +++- src/UI/LanguagePicker.ts | 7 ++++++- src/UI/i18n/Locale.ts | 2 +- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index c4b0e0ad3..196a3b2a3 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -33,7 +33,16 @@ "id": "language_picker", "render": { "*": "{language_picker()}" - } + }, + "mappings": [ + { + "if": "__url_parameter_initialized:language=yes", + "icon": "./assets/layers/usersettings/translate_disabled.svg", + "then": { + "en": "The language was set via an URL-parameter and cannot be set by the user.²" + } + } + ] }, { "id": "inbox", diff --git a/src/Logic/State/UserRelatedState.ts b/src/Logic/State/UserRelatedState.ts index 390aa0657..a84d81400 100644 --- a/src/Logic/State/UserRelatedState.ts +++ b/src/Logic/State/UserRelatedState.ts @@ -15,6 +15,7 @@ import Locale from "../../UI/i18n/Locale" import LinkToWeblate from "../../UI/Base/LinkToWeblate" import FeatureSwitchState from "./FeatureSwitchState" import Constants from "../../Models/Constants" +import { QueryParameters } from "../Web/QueryParameters" /** * The part of the state which keeps track of user-related stuff, e.g. the OSM-connection, @@ -93,13 +94,21 @@ export default class UserRelatedState { this.osmConnection.GetLongPreference("identity", "mangrove") ) - this.language.addCallbackAndRunD((language) => Locale.language.setData(language)) - this.installedUserThemes = this.InitInstalledUserThemes() this.homeLocation = this.initHomeLocation() this.preferencesAsTags = this.initAmendedPrefs(layout, featureSwitches) + + this.syncLanguage() + } + + private syncLanguage() { + if (QueryParameters.wasInitialized("language")) { + return + } + + this.language.addCallbackAndRunD((language) => Locale.language.setData(language)) } private static initUserRelatedState(): LayerConfig { @@ -246,6 +255,10 @@ export default class UserRelatedState { amendedPrefs.data["__userjourney_" + key] = Constants.userJourney[key] } + for (const key of QueryParameters.initializedParameters()) { + amendedPrefs.data["__url_parameter_initialized:" + key] = "yes" + } + const osmConnection = this.osmConnection osmConnection.preferencesHandler.preferences.addCallback((newPrefs) => { for (const k in newPrefs) { @@ -268,6 +281,7 @@ export default class UserRelatedState { }) const usersettingsConfig = UserRelatedState.usersettingsConfig const translationMode = osmConnection.GetPreference("translation-mode") + Locale.language.mapD( (language) => { amendedPrefs.data["_language"] = language diff --git a/src/Logic/Web/QueryParameters.ts b/src/Logic/Web/QueryParameters.ts index 32053243b..92dcf109b 100644 --- a/src/Logic/Web/QueryParameters.ts +++ b/src/Logic/Web/QueryParameters.ts @@ -57,6 +57,9 @@ export class QueryParameters { this.init() return QueryParameters._wasInitialized.has(key) } + public static initializedParameters(): ReadonlyArray { + return Array.from(QueryParameters._wasInitialized.keys()) + } private static addOrder(key) { if (this.order.indexOf(key) < 0) { @@ -131,5 +134,4 @@ export class QueryParameters { QueryParameters._wasInitialized.clear() QueryParameters.order = [] } - } diff --git a/src/UI/LanguagePicker.ts b/src/UI/LanguagePicker.ts index 5166f7267..497e0024b 100644 --- a/src/UI/LanguagePicker.ts +++ b/src/UI/LanguagePicker.ts @@ -8,11 +8,16 @@ import Lazy from "./Base/Lazy" import Toggle from "./Input/Toggle" import LanguageUtils from "../Utils/LanguageUtils" import { UIEventSource } from "../Logic/UIEventSource" +import { QueryParameters } from "../Logic/Web/QueryParameters" export default class LanguagePicker extends Toggle { constructor(languages: string[], assignTo: UIEventSource) { console.log("Constructing a language pîcker for languages", languages) - if (languages === undefined || languages.length <= 1) { + if ( + languages === undefined || + languages.length <= 1 || + QueryParameters.wasInitialized("language") + ) { super(undefined, undefined, undefined) } else { const normalPicker = LanguagePicker.dropdownFor(languages, assignTo ?? Locale.language) diff --git a/src/UI/i18n/Locale.ts b/src/UI/i18n/Locale.ts index 4112ef8a4..09848aa0d 100644 --- a/src/UI/i18n/Locale.ts +++ b/src/UI/i18n/Locale.ts @@ -39,8 +39,8 @@ export default class Locale { "The language to display MapComplete in.", "The user display language is determined in the following order:", "", + "1. Use the language as set by the URL-parameter `language`. This will _disable_ setting the language by the user", "1. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences.", - "2. Use the language as set by the URL-parameter `language`. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language", "3. If the user visited MapComplete before and did change their language manually, this changed language will be saved in local storage. Use the language from local storage", "4. Use the navigator-language (if available)", "5. Use English", From 157592427fe4ef1c7beded2a92d0222419626e77 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 01:50:37 +0200 Subject: [PATCH 007/134] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 634428003..96c481e76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapcomplete", - "version": "0.31.0", + "version": "0.31.1", "repository": "https://github.com/pietervdvn/MapComplete", "description": "A small website to edit OSM easily", "bugs": "https://github.com/pietervdvn/MapComplete/issues", From 5a678266a42a04f365e128af93e1873977c3b432 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 01:56:36 +0200 Subject: [PATCH 008/134] Chore: regenerate docs --- Docs/BuiltinQuestions.md | 753 ++++++++++++++++++++++++++++++++++++++- Docs/URL_Parameters.md | 4 +- 2 files changed, 750 insertions(+), 7 deletions(-) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index aff72f926..65dc34aed 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -1,16 +1,759 @@ [//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) - Builtin questions -=================== + questions +=========== + + + + + +Special library layer which does not need a '.questions'-prefix before being imported -The following items can be easily reused in your layers ## Table of contents -1. [Builtin questions](#builtin-questions) +1. [questions](#questions) + - [Basic tags for this layer](#basic-tags-for-this-layer) + - [Supported attributes](#supported-attributes) + + [questions](#questions) + + [images](#images) + + [mapillary](#mapillary) + + [export_as_gpx](#export_as_gpx) + + [export_as_geojson](#export_as_geojson) + + [wikipedia](#wikipedia) + + [reviews](#reviews) + + [minimap](#minimap) + + [phone](#phone) + + [osmlink](#osmlink) + + [email](#email) + + [website](#website) + + [wheelchair-access](#wheelchair-access) + + [dog-access](#dog-access) + + [description](#description) + + [opening_hours](#opening_hours) + + [opening_hours_24_7](#opening_hours_24_7) + + [opening_hours_by_appointment](#opening_hours_by_appointment) + + [service:electricity](#serviceelectricity) + + [payment-options](#payment-options) + + [payment-options-split](#payment-options-split) + + [payment-options-advanced](#payment-options-advanced) + + [denominations-coins](#denominations-coins) + + [denominations-notes](#denominations-notes) + + [last_edit](#last_edit) + + [all_tags](#all_tags) + + [just_created](#just_created) + + [multilevels](#multilevels) + + [level](#level) + + [smoking](#smoking) + + [induction-loop](#induction-loop) + + [internet](#internet) + + [internet-fee](#internet-fee) + + [internet-ssid](#internet-ssid) + + [luminous_or_lit](#luminous_or_lit) + + + + + - This layer is shown at zoomlevel **0** and higher + - Elements don't have a title set and cannot be toggled nor will they show up in the dashboard. If you import this layer in your theme, override `title` to make this toggleable. + - Not visible in the layer selection by default. If you want to make this layer toggable, override `name` + - Not rendered on the map by default. If you want to rendering this on the map, override `mapRenderings` + + + + + Basic tags for this layer +--------------------------- + + + +Elements must have the all of following tags to be shown on this layer: + + + + + + + + + Supported attributes +---------------------- + + + +Warning: + +this quick overview is incomplete + + + +attribute | type | values which are supported by this layer +----------- | ------ | ------------------------------------------ +[](https://taginfo.openstreetmap.org/keys/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | +[](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | +[](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | +[](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | +[](https://taginfo.openstreetmap.org/keys/wheelchair#values) [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) +[](https://taginfo.openstreetmap.org/keys/dog#values) [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) +[](https://taginfo.openstreetmap.org/keys/description#values) [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | +[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) +[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment") +[](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno) +[](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) +[](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) +[](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | +[](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [string](../SpecialInputElements.md#string) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) +[](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) +[](https://taginfo.openstreetmap.org/keys/smoking#values) [smoking](https://wiki.openstreetmap.org/wiki/Key:smoking) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dno) [outside](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Doutside) +[](https://taginfo.openstreetmap.org/keys/hearing_loop#values) [hearing_loop](https://wiki.openstreetmap.org/wiki/Key:hearing_loop) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:hearing_loop%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:hearing_loop%3Dno) +[](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) +[](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) +[](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) + + + + +### questions + + + +Show the questions block at this location + +This tagrendering has no question and is thus read-only + + + + + +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images + +This tagrendering has no question and is thus read-only + + + + + +### mapillary + + + +Shows a button to open Mapillary on this location + +This tagrendering has no question and is thus read-only + + + + + +### export_as_gpx + + + +Shows a button to export this feature as GPX. Especially useful for route relations + +This tagrendering has no question and is thus read-only + + + + + +### export_as_geojson + + + +Shows a button to export this feature as geojson. Especially useful for debugging or using this in other programs + +This tagrendering has no question and is thus read-only + + + + + +### wikipedia + + + +Shows a wikipedia box with the corresponding wikipedia article; the wikidata-item link can be changed by a contributor + +The question is *What is the corresponding Wikidata entity?* + +This rendering asks information about the property [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) + +This is rendered with `{wikipedia():max-height:25rem}` + + + + + + - *{wikipedia():max-height:25rem}* corresponds with `wikipedia~.+` + - This option cannot be chosen as answer + - *No Wikipedia page has been linked yet* corresponds with `` + - This option cannot be chosen as answer + + + + +### reviews + + + +Shows the reviews module (including the possibility to leave a review) + +This tagrendering has no question and is thus read-only + + + + + +### minimap + + + +Shows a small map with the feature. Added by default to every popup + +This tagrendering has no question and is thus read-only + + + + + +### phone + + + +The question is *What is the phone number of {title()}?* + +This rendering asks information about the property [phone](https://wiki.openstreetmap.org/wiki/Key:phone) + +This is rendered with `{phone}` + + + + + + - *{contact:phone}* corresponds with `contact:phone~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + +### osmlink + + + +This tagrendering has no question and is thus read-only + + + + + + - *Uploading...* corresponds with `id~^(=-)$` + + + + +### email + + + +The question is *What is the email address of {title()}?* + +This rendering asks information about the property [email](https://wiki.openstreetmap.org/wiki/Key:email) + +This is rendered with `{email}` + + + + + + - *{contact:email}* corresponds with `contact:email~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + +### website + + + +The question is *What is the website of {title()}?* + +This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) + +This is rendered with `{website}` + + + + + + - *{contact:website}* corresponds with `contact:website~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + +### wheelchair-access + + + +The question is *Is this place accessible with a wheelchair?* + + + + + + - *This place is specially adapted for wheelchair users* corresponds with `wheelchair=designated` + - *This place is easily reachable with a wheelchair* corresponds with `wheelchair=yes` + - *It is possible to reach this place in a wheelchair, but it is not easy* corresponds with `wheelchair=limited` + - *This place is not reachable with a wheelchair* corresponds with `wheelchair=no` + + + + +### dog-access + + + +The question is *Are dogs allowed in this business?* + + + + + + - *Dogs are allowed* corresponds with `dog=yes` + - *Dogs are not allowed* corresponds with `dog=no` + - *Dogs are allowed, but they have to be leashed* corresponds with `dog=leashed` + - *Dogs are allowed and can run around freely* corresponds with `dog=unleashed` + + + + +### description + + + +The question is *Is there still some relevant info that the previous questions did not cover? Feel free to add it here.* + +This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) + +This is rendered with `{description}` + + + + + +### opening_hours + + + +The question is *What are the opening hours of {title()}?* + +This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) + +This is rendered with `

Opening hours

{opening_hours_table(opening_hours)}` + + + + + +### opening_hours_24_7 + + + +The question is *What are the opening hours of {title()}?* + +This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) + +This is rendered with `

Opening hours

{opening_hours_table(opening_hours)}` + + + + + + - *24/7 opened (including holidays)* corresponds with `opening_hours=24/7` + + + + +### opening_hours_by_appointment + + + +The question is *What are the opening hours of {title()}?* + +This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) + +This is rendered with `

Opening hours

{opening_hours_table(opening_hours)}` + + + + + + - *Only by appointment* corresponds with `opening_hours="by appointment"` + - *Only by appointment* corresponds with `opening_hours~^("by appointment"|by appointment)$` + - This option cannot be chosen as answer + + + + +### service:electricity + + + +The question is *Does this amenity have electrical outlets, available to customers when they are inside?* + + + + + + - *There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics* corresponds with `service:electricity=yes` + - *There are a few domestic sockets available to customers seated indoors, where they can charge their electronics* corresponds with `service:electricity=limited` + - *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* corresponds with `service:electricity=ask` + - *There are a no domestic sockets available to customers seated indoors* corresponds with `service:electricity=no` + + + + +### payment-options + + + +The question is *Which methods of payment are accepted here?* + + + + + + - *Cash is accepted here* corresponds with `payment:cash=yes` + - Unselecting this answer will add payment:cash=no + - *Payment cards are accepted here* corresponds with `payment:cards=yes` + - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no + + + + +### payment-options-split + + + +The question is *Which methods of payment are accepted here?* + + + + + + - *Cash is accepted here* corresponds with `payment:cash=yes` + - This option cannot be chosen as answer + - Unselecting this answer will add + - *Payment cards are accepted here* corresponds with `payment:cards=yes` + - This option cannot be chosen as answer + - Unselecting this answer will add + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no + - *Coins are accepted here* corresponds with `payment:coins=yes` + - Unselecting this answer will add payment:coins=no + - *Bank notes are accepted here* corresponds with `payment:notes=yes` + - Unselecting this answer will add payment:notes=no + - *Debit cards are accepted here* corresponds with `payment:debit_cards=yes` + - Unselecting this answer will add payment:debit_cards=no + - *Credit cards are accepted here* corresponds with `payment:credit_cards=yes` + - Unselecting this answer will add payment:credit_cards=no + + + + +### payment-options-advanced + + + +The question is *Which methods of payment are accepted here?* + + + + + + - *Cash is accepted here* corresponds with `payment:cash=yes` + - Unselecting this answer will add payment:cash=no + - *Payment cards are accepted here* corresponds with `payment:cards=yes` + - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no + - *Payment is done using a dedicated app* corresponds with `payment:app=yes` + - Unselecting this answer will add payment:app=no + - *Payment is done using a membership card* corresponds with `payment:membership_card=yes` + - Unselecting this answer will add payment:membership_card=no + + + + +### denominations-coins + + + +The question is *What coins can you use to pay here?* + + + + + + - *1 cent coins are accepted* corresponds with `payment:coins:denominations=0.01 EUR` + - *2 cent coins are accepted* corresponds with `payment:coins:denominations=0.02 EUR` + - *5 cent coins are accepted* corresponds with `payment:coins:denominations=0.05 EUR` + - *10 cent coins are accepted* corresponds with `payment:coins:denominations=0.10 EUR` + - *20 cent coins are accepted* corresponds with `payment:coins:denominations=0.20 EUR` + - *50 cent coins are accepted* corresponds with `payment:coins:denominations=0.50 EUR` + - *1 euro coins are accepted* corresponds with `payment:coins:denominations=1 EUR` + - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR` + + + +### denominations-notes + + + +The question is *what notes can you use to pay here?* + + + + + + - *5 euro notes are accepted* corresponds with `payment:notes:denominations=5 EUR` + - *10 euro notes are accepted* corresponds with `payment:notes:denominations=10 EUR` + - *20 euro notes are accepted* corresponds with `payment:notes:denominations=20 EUR` + - *50 euro notes are accepted* corresponds with `payment:notes:denominations=50 EUR` + - *100 euro notes are accepted* corresponds with `payment:notes:denominations=100 EUR` + - *200 euro notes are accepted* corresponds with `payment:notes:denominations=200 EUR` + - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR` + + + +### last_edit + + + +Gives some metainfo about the last edit and who did edit it - rendering only + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `_last_edit:contributor~.+&_last_edit:changeset~.+` + + + +### all_tags + + + +Shows a table with all the tags of the feature + +This tagrendering has no question and is thus read-only + + + + + +### just_created + + + +This element shows a 'thank you' that the contributor has recently created this element + +This tagrendering has no question and is thus read-only + + + + + + - *You just created this element! Thanks for sharing this info with the world and helping people worldwide.* corresponds with `id~.+` + + +This tagrendering is only visible in the popup if the following condition is met: `_backend~.+&_last_edit:passed_time<300&|_version_number=1` + + + +### multilevels + + + +The question is *What levels does this elevator go to?* + +This rendering asks information about the property [level](https://wiki.openstreetmap.org/wiki/Key:level) + +This is rendered with `This elevator goes to floors {level}` + + + + + + - *Located underground* corresponds with `location=underground` + - This option cannot be chosen as answer + - *Located on the ground floor* corresponds with `level=0` + - *Located on the ground floor* corresponds with `` + - This option cannot be chosen as answer + - *Located on the first floor* corresponds with `level=1` + - *Located on the first basement level* corresponds with `level=-1` + + + + +### level + + + +The question is *On what level is this feature located?* + +This rendering asks information about the property [level](https://wiki.openstreetmap.org/wiki/Key:level) + +This is rendered with `Located on the {level}th floor` + + + + + + - *Located underground* corresponds with `location=underground` + - This option cannot be chosen as answer + - *Located on the ground floor* corresponds with `level=0` + - *Located on the ground floor* corresponds with `` + - This option cannot be chosen as answer + - *Located on the first floor* corresponds with `level=1` + - *Located on the first basement level* corresponds with `level=-1` + + + + +### smoking + + + +The question is *Is smoking allowed at {title()}?* + + + + + + - *Smoking is allowed* corresponds with `smoking=yes` + - *Smoking is not allowed* corresponds with `smoking=no` + - *Smoking is allowed outside.* corresponds with `smoking=outside` + + + + +### induction-loop + + + +An accessibility feature: induction loops are for hard-hearing persons which have an FM-receiver. + +The question is *Does this place have an audio induction loop for people with reduced hearing?* + + + + + + - *This place has an audio induction loop* corresponds with `hearing_loop=yes` + - *This place does not have an audio induction loop* corresponds with `hearing_loop=no` + + + + +### internet + + + +The question is *Does this place offer internet access?* + + + + + + - *This place offers wireless internet access* corresponds with `internet_access=wlan` + - *This place does not offer internet access* corresponds with `internet_access=no` + - *This place offers internet access* corresponds with `internet_access=yes` + - This option cannot be chosen as answer + - *This place offers internet access via a terminal or computer* corresponds with `internet_access=terminal` + - *This place offers wired internet access* corresponds with `internet_access=wired` + + + + +### internet-fee + + + +The question is *Is there a fee for internet access?* + + + + + + - *There is a fee for the internet access at this place* corresponds with `internet_access:fee=yes` + - *Internet access is free at this place* corresponds with `internet_access:fee=no` + - *Internet access is free at this place, for customers only* corresponds with `internet_access:fee=customers` + + +This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+` + + + +### internet-ssid + + + +The question is *What is the network name for the wireless internet access?* + +This rendering asks information about the property [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) + +This is rendered with `The network name is {internet_access:ssid}` + + + + + + - *Telekom* corresponds with `internet_access:ssid=Telekom` + + +This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan` + + + +### luminous_or_lit + + + +The question is *Is this object lit or does it emit light?* + + + + + + - *This object both emits light and is lighted by an external light source* corresponds with `lit=yes&luminous=yes` + - *This object emits light* corresponds with `luminous=yes` + - *This object is lit externally, e.g. by a spotlight or other lights* corresponds with `lit=yes` + - *This object does not emit light and is not lighted by externally* corresponds with `lit=no&luminous=no` -This document is autogenerated from [src/Customizations/SharedTagRenderings.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Customizations/SharedTagRenderings.ts), [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json) +This document is autogenerated from [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json) diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md index 78a4cf329..075bc68aa 100644 --- a/Docs/URL_Parameters.md +++ b/Docs/URL_Parameters.md @@ -68,8 +68,8 @@ Finally, the URL-hash is the part after the `#`. It is `node/1234` in this case. The language to display MapComplete in. The user display language is determined in the following order: -1. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences. -2. Use the language as set by the URL-parameter `language`. This will _disable_ saving the language to localStorage in case a non-logged-in user changes their language +1. Use the language as set by the URL-parameter `language`. This will _disable_ setting the language by the user +2. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences. 3. If the user visited MapComplete before and did change their language manually, this changed language will be saved in local storage. Use the language from local storage 4. Use the navigator-language (if available) 5. Use English From 88a282c2c05c676b510d51f73a292462a02ed830 Mon Sep 17 00:00:00 2001 From: Emory Shaw Date: Mon, 17 Jul 2023 20:44:36 +0000 Subject: [PATCH 009/134] Translated using Weblate (French) Currently translated at 70.0% (351 of 501 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/fr/ --- langs/fr.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/langs/fr.json b/langs/fr.json index 30b02c9ac..7527e367f 100644 --- a/langs/fr.json +++ b/langs/fr.json @@ -97,6 +97,7 @@ "isApplied": "Les changements sont appliqués" }, "attribution": { + "attributionBackgroundLayerWithCopyright": "Le fond de carte actuel est {name}: {copyright}", "attributionContent": "

Toutes les données sont fournies par OpenStreetMap, librement réutilisables sous Open DataBase License.

", "attributionTitle": "Crédits", "codeContributionsBy": "MapComplete a été construit par {contributors} et {hiddenCount} autres contributeurs", @@ -117,6 +118,7 @@ "openMapillary": "Ouvrez Mapillary ici", "openOsmcha": "Voir les dernières modifications faites avec {theme}", "themeBy": "Thème maintenu par {author}", + "title": "Droits d'auteur et attribution", "translatedBy": "MapComplete est traduite par {contributors} et {hiddenCount} autres personnes" }, "back": "Retour", @@ -166,6 +168,10 @@ "loginToStart": "Connectez-vous pour répondre à cette question", "loginWithOpenStreetMap": "Se connecter avec OpenStreetMap", "logout": "Déconnexion", + "menu": { + "aboutMapComplete": "À propos de MapComplete", + "filter": "Filtrer les données" + }, "morescreen": { "createYourOwnTheme": "Créez votre propre thème MapComplete à partir de zéro", "hiddenExplanation": "Ces thèmes sont seulement accessibles par lien. Vous avez découvert {hidden_discovered} des {total_hidden} thèmes cachés.", @@ -232,6 +238,7 @@ "error": "Quelque chose n'a pas marché…", "nothing": "Rien n'a été trouvé…", "search": "Chercher un lieu", + "searchShort": "Rechercher…", "searching": "Chargement…" }, "sharescreen": { @@ -253,7 +260,8 @@ "fsUserbadge": "Activer le bouton de connexion", "fsWelcomeMessage": "Afficher le message de bienvenue et les onglets associés", "intro": "

Partager cette carte

Partagez cette carte en copiant le lien suivant et envoyez-le à vos amis :", - "thanksForSharing": "Merci d'avoir partagé !" + "thanksForSharing": "Merci d'avoir partagé !", + "title": "Partager cette carte" }, "skip": "Passer la question", "testing": "Test - les changements ne seront pas sauvegardés", @@ -458,7 +466,8 @@ "userinfo": { "editDescription": "Modifier ton profil", "gotoInbox": "Ouvrir sa boite de réception", - "gotoSettings": "Paramètres sur OpenStreetMap.org" + "gotoSettings": "Paramètres sur OpenStreetMap.org", + "notLoggedIn": "Déconnecté" }, "validation": { "email": { From 4db6ea962d8c1fb61e671d4b6ea46d5befa0583f Mon Sep 17 00:00:00 2001 From: deep map Date: Fri, 21 Jul 2023 10:43:34 +0000 Subject: [PATCH 010/134] Translated using Weblate (English) Currently translated at 100.0% (450 of 450 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/ --- langs/themes/en.json | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/langs/themes/en.json b/langs/themes/en.json index 2659143d6..0e13b11b7 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1066,6 +1066,33 @@ "onwheels": { "description": "On this map, publicly weelchair accessible places are shown and can be easily added", "layers": { + "19": { + "override": { + "=title": { + "render": "Statistics" + } + } + }, + "20": { + "override": { + "+tagRenderings": { + "0": { + "render": { + "special": { + "text": "Import" + } + } + }, + "1": { + "render": { + "special": { + "message": "Add all the suggested tags" + } + } + } + } + } + }, "4": { "override": { "filter": { @@ -1108,33 +1135,6 @@ "override": { "name": "Disabled parking spaces" } - }, - "19": { - "override": { - "=title": { - "render": "Statistics" - } - } - }, - "20": { - "override": { - "+tagRenderings": { - "0": { - "render": { - "special": { - "text": "Import" - } - } - }, - "1": { - "render": { - "special": { - "message": "Add all the suggested tags" - } - } - } - } - } } }, "title": "OnWheels" @@ -1216,7 +1216,7 @@ "title": "Postal codes" }, "postboxes": { - "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ", + "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account.", "shortDescription": "A map showing postboxes and post offices", "title": "Postbox and Post Office Map" }, @@ -1295,10 +1295,6 @@ "stations": { "description": "View, edit and add details to a train station", "layers": { - "3": { - "description": "Layer showing train stations", - "name": "Train Stations" - }, "16": { "description": "Displays showing the trains that will leave from this station", "name": "Departures boards", @@ -1330,6 +1326,10 @@ "title": { "render": "Departures board" } + }, + "3": { + "description": "Layer showing train stations", + "name": "Train Stations" } }, "title": "Train Stations" @@ -1425,4 +1425,4 @@ "shortDescription": "A map with waste baskets", "title": "Waste Basket" } -} \ No newline at end of file +} From 2eb4172391c0ca78072f2f6d7a46b4b278dc2fa5 Mon Sep 17 00:00:00 2001 From: deep map Date: Fri, 21 Jul 2023 10:13:45 +0000 Subject: [PATCH 011/134] Translated using Weblate (German) Currently translated at 100.0% (502 of 502 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/langs/de.json b/langs/de.json index 779cf83d3..2995ce4dd 100644 --- a/langs/de.json +++ b/langs/de.json @@ -227,6 +227,7 @@ }, "morescreen": { "createYourOwnTheme": "Ein eigenes MapComplete-Thema von Grund auf neu erstellen", + "enterToOpen": "Drücke Enter um Theme zu öffnen", "hiddenExplanation": "Diese Themen sind nur für Personen zugänglich, die einen Link erhalten haben. Sie haben {hidden_discovered} von {total_hidden} versteckten Themen entdeckt.", "intro": "

Mehr thematische Karten?

Sammeln Sie gerne Geodaten?
Es sind weitere Themen verfügbar.", "noMatchingThemes": "Keine Themen, die Ihren Suchkriterien entsprechen", From 8b96b78bc5916f9c7706ed5fb47b9b3a4fd2310f Mon Sep 17 00:00:00 2001 From: kjon Date: Thu, 20 Jul 2023 19:20:25 +0000 Subject: [PATCH 012/134] Translated using Weblate (German) Currently translated at 99.7% (449 of 450 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/ --- langs/themes/de.json | 98 +++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 32 deletions(-) diff --git a/langs/themes/de.json b/langs/themes/de.json index 36353d8fe..cfc906dc2 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -408,6 +408,40 @@ } } } + }, + "1": { + "override": { + "+tagRenderings": { + "0": { + "mappings": { + "0": { + "then": "Dieser Laden repariert Kletterschuhe" + }, + "1": { + "then": "Dieser Shop repariert keine Kletterschuhe" + } + }, + "question": "Repariert das Schuhgeschäft Kletterschuhe?" + } + } + } + }, + "2": { + "override": { + "+tagRenderings": { + "0": { + "mappings": { + "0": { + "then": "Dieses Geschäft repariert Kletterschuhe" + }, + "1": { + "then": "Dieses Geschäft repariert keine Kletterschuhe" + } + }, + "question": "Repariert dieses Schuhgeschäft auch Kletterschuhe?" + } + } + } } }, "title": "Kletterhallen, Vereine und Kletterstellen" @@ -936,6 +970,33 @@ "onwheels": { "description": "Auf dieser Karte können Sie öffentlich zugängliche Orte für Rollstuhlfahrer ansehen, bearbeiten oder hinzufügen", "layers": { + "19": { + "override": { + "=title": { + "render": "Statistik" + } + } + }, + "20": { + "override": { + "+tagRenderings": { + "0": { + "render": { + "special": { + "text": "Import" + } + } + }, + "1": { + "render": { + "special": { + "message": "Alle vorgeschlagenen Tags hinzufügen" + } + } + } + } + } + }, "4": { "override": { "filter": { @@ -978,33 +1039,6 @@ "override": { "name": "Barrierefreie Parkplätze" } - }, - "19": { - "override": { - "=title": { - "render": "Statistik" - } - } - }, - "20": { - "override": { - "+tagRenderings": { - "0": { - "render": { - "special": { - "text": "Import" - } - } - }, - "1": { - "render": { - "special": { - "message": "Alle vorgeschlagenen Tags hinzufügen" - } - } - } - } - } } }, "title": "Auf Rädern" @@ -1165,10 +1199,6 @@ "stations": { "description": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", "layers": { - "3": { - "description": "Ebene mit Bahnhöfen", - "name": "Bahnhöfe" - }, "16": { "description": "Anzeigen der Züge, die von diesem Bahnhof abfahren", "name": "Abfahrtstafeln", @@ -1200,6 +1230,10 @@ "title": { "render": "Abfahrtstafel" } + }, + "3": { + "description": "Ebene mit Bahnhöfen", + "name": "Bahnhöfe" } }, "title": "Bahnhöfe" @@ -1291,4 +1325,4 @@ "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} \ No newline at end of file +} From fc25a01d589e0ab0f0d865d21f4e241d50712fe0 Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 19 Jul 2023 20:30:02 +0000 Subject: [PATCH 013/134] Translated using Weblate (French) Currently translated at 60.4% (1748 of 2891 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/fr/ --- langs/layers/fr.json | 223 ++++++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 108 deletions(-) diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 7a2bbe92b..1ca74c04d 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -27,7 +27,24 @@ "advertising": { "presets": { "0": { - "description": "Un grand équipement extérieur, principalement disposé dans les zones à fort trafic comme une route" + "description": "Un grand équipement extérieur, principalement disposé dans les zones à fort trafic comme une route", + "title": "un grand panneau" + }, + "1": { + "title": "un panneau à affiches scellé au sol" + }, + "10": { + "description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées", + "title": "une enseigne" + }, + "11": { + "title": "une sculpture" + }, + "12": { + "title": "une peinture murale" + }, + "2": { + "title": "un panneau à affiches monté sur un mur" }, "3": { "description": "Petit panneau pour l’affichage de proximité, généralement à destination des piétons", @@ -51,16 +68,6 @@ }, "9": { "title": "un totem" - }, - "10": { - "description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées", - "title": "une enseigne" - }, - "11": { - "title": "une sculpture" - }, - "12": { - "title": "une peinture murale" } }, "tagRenderings": { @@ -152,6 +159,9 @@ "1": { "then": "C'est un petit panneau" }, + "10": { + "then": "C'est une peinture murale" + }, "2": { "then": "C'est une colonne" }, @@ -175,9 +185,6 @@ }, "9": { "then": "C'est un totem" - }, - "10": { - "then": "C'est une peinture murale" } }, "question": "De quel type de dispositif publicitaire s'agit-il ?" @@ -188,6 +195,9 @@ "1": { "then": "Petit panneau" }, + "10": { + "then": "Peinture murale" + }, "3": { "then": "Colonne" }, @@ -208,9 +218,6 @@ }, "9": { "then": "Totem" - }, - "10": { - "then": "Peinture murale" } } } @@ -289,6 +296,15 @@ "1": { "then": "Peinture murale" }, + "10": { + "then": "Azulejo (faïence latine)" + }, + "11": { + "then": "Carrelage" + }, + "12": { + "then": "Sculpture sur bois" + }, "2": { "then": "Peinture" }, @@ -312,15 +328,6 @@ }, "9": { "then": "Relief" - }, - "10": { - "then": "Azulejo (faïence latine)" - }, - "11": { - "then": "Carrelage" - }, - "12": { - "then": "Sculpture sur bois" } }, "question": "Quel est le type de cette œuvre d'art ?", @@ -2356,6 +2363,15 @@ "1": { "then": "Cette piste cyclable est goudronée" }, + "10": { + "then": "Cette piste cyclable est faite en graviers fins" + }, + "11": { + "then": "Cette piste cyclable est en cailloux" + }, + "12": { + "then": "Cette piste cyclable est faite en sol brut" + }, "2": { "then": "Cette piste cyclable est asphaltée" }, @@ -2379,15 +2395,6 @@ }, "9": { "then": "Cette piste cyclable est faite en graviers" - }, - "10": { - "then": "Cette piste cyclable est faite en graviers fins" - }, - "11": { - "then": "Cette piste cyclable est en cailloux" - }, - "12": { - "then": "Cette piste cyclable est faite en sol brut" } }, "question": "De quoi est faite la surface de la piste cyclable ?", @@ -2436,6 +2443,15 @@ "1": { "then": "Cette piste cyclable est pavée" }, + "10": { + "then": "Cette piste cyclable est faite en graviers fins" + }, + "11": { + "then": "Cette piste cyclable est en cailloux" + }, + "12": { + "then": "Cette piste cyclable est faite en sol brut" + }, "2": { "then": "Cette piste cyclable est asphaltée" }, @@ -2459,15 +2475,6 @@ }, "9": { "then": "Cette piste cyclable est faite en graviers" - }, - "10": { - "then": "Cette piste cyclable est faite en graviers fins" - }, - "11": { - "then": "Cette piste cyclable est en cailloux" - }, - "12": { - "then": "Cette piste cyclable est faite en sol brut" } }, "question": "De quel materiel est faite cette rue ?", @@ -3297,6 +3304,21 @@ "1": { "then": "C'est une friterie" }, + "10": { + "then": "Des plats chinois sont servis ici" + }, + "11": { + "then": "Des plats grecs sont servis ici" + }, + "12": { + "then": "Des plats indiens sont servis ici" + }, + "13": { + "then": "Des plats turcs sont servis ici" + }, + "14": { + "then": "Des plats thaïlandais sont servis ici" + }, "2": { "then": "Restaurant Italien" }, @@ -3320,21 +3342,6 @@ }, "9": { "then": "Des plats français sont servis ici" - }, - "10": { - "then": "Des plats chinois sont servis ici" - }, - "11": { - "then": "Des plats grecs sont servis ici" - }, - "12": { - "then": "Des plats indiens sont servis ici" - }, - "13": { - "then": "Des plats turcs sont servis ici" - }, - "14": { - "then": "Des plats thaïlandais sont servis ici" } }, "question": "Quelle type de nourriture est servie ici ?", @@ -4663,30 +4670,6 @@ "1": { "question": "Recyclage de piles et batteries domestiques" }, - "2": { - "question": "Recyclage d'emballage de boissons" - }, - "3": { - "question": "Recyclage de boites de conserve et de canettes" - }, - "4": { - "question": "Recyclage de vêtements" - }, - "5": { - "question": "Recyclage des huiles de friture" - }, - "6": { - "question": "Recyclage des huiles de moteur" - }, - "7": { - "question": "Recyclage des lampes fluorescentes" - }, - "8": { - "question": "Recyclage des déchets verts" - }, - "9": { - "question": "Recyclage des bouteilles en verre et des bocaux" - }, "10": { "question": "Recyclage de tout type de verre" }, @@ -4717,11 +4700,35 @@ "19": { "question": "Recyclage des autres déchets" }, + "2": { + "question": "Recyclage d'emballage de boissons" + }, "20": { "question": "Recyclage des cartouches d'imprimante" }, "21": { "question": "Recyclage des vélos" + }, + "3": { + "question": "Recyclage de boites de conserve et de canettes" + }, + "4": { + "question": "Recyclage de vêtements" + }, + "5": { + "question": "Recyclage des huiles de friture" + }, + "6": { + "question": "Recyclage des huiles de moteur" + }, + "7": { + "question": "Recyclage des lampes fluorescentes" + }, + "8": { + "question": "Recyclage des déchets verts" + }, + "9": { + "question": "Recyclage des bouteilles en verre et des bocaux" } } }, @@ -4784,30 +4791,6 @@ "1": { "then": "Les briques alimentaires en carton peuvent être recyclées ici" }, - "2": { - "then": "Les boites de conserve et canettes peuvent être recyclées ici" - }, - "3": { - "then": "Les vêtements peuvent être recyclés ici" - }, - "4": { - "then": "Les huiles de friture peuvent être recyclées ici" - }, - "5": { - "then": "Les huiles de moteur peuvent être recyclées ici" - }, - "6": { - "then": "Les lampes fluorescentes peuvent être recyclées ici" - }, - "7": { - "then": "Les déchets verts peuvent être recyclés ici" - }, - "8": { - "then": "Les déchets organiques peuvent être recyclés ici" - }, - "9": { - "then": "Les bouteilles en verre et bocaux peuvent être recyclés ici" - }, "10": { "then": "Tout type de verre peut être recyclé ici" }, @@ -4838,6 +4821,9 @@ "19": { "then": "Les chaussures peuvent être recyclées ici" }, + "2": { + "then": "Les boites de conserve et canettes peuvent être recyclées ici" + }, "20": { "then": "Les petits appareils électriques peuvent être recyclés ici" }, @@ -4852,6 +4838,27 @@ }, "24": { "then": "Les vélos peuvent être recyclés ici" + }, + "3": { + "then": "Les vêtements peuvent être recyclés ici" + }, + "4": { + "then": "Les huiles de friture peuvent être recyclées ici" + }, + "5": { + "then": "Les huiles de moteur peuvent être recyclées ici" + }, + "6": { + "then": "Les lampes fluorescentes peuvent être recyclées ici" + }, + "7": { + "then": "Les déchets verts peuvent être recyclés ici" + }, + "8": { + "then": "Les déchets organiques peuvent être recyclés ici" + }, + "9": { + "then": "Les bouteilles en verre et bocaux peuvent être recyclés ici" } }, "question": "Que peut-on recycler ici ?" @@ -6205,4 +6212,4 @@ } } } -} \ No newline at end of file +} From 208ad81f34969c07c57bf1cb9df2da9d9ea4ab44 Mon Sep 17 00:00:00 2001 From: deep map Date: Fri, 21 Jul 2023 10:21:49 +0000 Subject: [PATCH 014/134] Translated using Weblate (German) Currently translated at 99.7% (449 of 450 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/ --- langs/themes/de.json | 102 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/langs/themes/de.json b/langs/themes/de.json index cfc906dc2..77c671f21 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -440,6 +440,11 @@ }, "question": "Repariert dieses Schuhgeschäft auch Kletterschuhe?" } + }, + "=presets": { + "0": { + "title": "Ein Schuhmacher" + } } } } @@ -602,6 +607,97 @@ "description": "Auf dieser Karte können Sie Informationen über Bildungseinrichtungen finden und hinzufügen", "title": "Bildungseinrichtungen" }, + "elongated_coin": { + "description": "Finde Münzpresse um deine eigenen Prägemünzen zu Pressen.", + "layers": { + "0": { + "description": "Ebene mit Münzpressen.", + "name": "Münzpressen", + "presets": { + "0": { + "title": "Eine Münzpresse" + } + }, + "tagRenderings": { + "charge": { + "freeform": { + "placeholder": "Einwurf (z.B. 0,5€)" + }, + "mappings": { + "0": { + "then": "Eine Münze zu Pressen kostet 1 Euro." + }, + "1": { + "then": "Eine Münze zu Pressen kostet 2€." + } + }, + "question": "Wieviel kostet es eine Münze zu Pressen?", + "render": "Es kostet {charge}€ um eine Münze zu Pressen." + }, + "coin": { + "freeform": { + "placeholder": "Münzenart (z.B. 10 Cent)" + }, + "mappings": { + "0": { + "then": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen." + }, + "1": { + "then": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen." + }, + "2": { + "then": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen." + }, + "3": { + "then": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen." + }, + "4": { + "then": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen." + } + }, + "question": "Welche Münze wird zum Pressen verwendet?", + "render": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen." + }, + "designs": { + "freeform": { + "placeholder": "Motivanzahl (z.B. 5)" + }, + "mappings": { + "0": { + "then": "Die Münzpresse hat ein Motiv zur Auswahl." + }, + "1": { + "then": "Die Münzpresse hat zwei Motive zur Auswahl." + }, + "2": { + "then": "Die Münzpresse hat drei Motive zur Auswahl." + }, + "3": { + "then": "Die Münzpresse hat vier Motive zur Auswahl." + } + }, + "question": "Wieviele Motive sind verfügbar?", + "render": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl." + }, + "indoor": { + "mappings": { + "0": { + "then": "Die Münzpresse befindet sich im Inneren." + }, + "1": { + "then": "Die Münzpresse befindet sich Draußen." + } + }, + "question": "Befindet sich die Münzpresse im Inneren?" + } + }, + "title": { + "render": "Münzpresse" + } + } + }, + "title": "Münzpressen" + }, "etymology": { "description": "Auf dieser Karte können Sie sehen, wonach ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, und wurden mit Wikidata verknüpft. Im Popup sehen Sie den Wikipedia-Artikel (falls vorhanden) oder ein Wikidata-Feld, nach dem das Objekt benannt ist. Wenn das Objekt selbst eine Wikipedia-Seite hat, wird auch diese angezeigt.

Sie können auch einen Beitrag leisten! Wenn Sie weit genug hinein zoomen werden alle Straßen angezeigt. Wenn Sie auf eine Straße klicken, öffnet sich ein Wikidata-Suchfeld. Mit ein paar Klicks können Sie einen Etymologie-Link hinzufügen. Beachten Sie, dass Sie dazu ein kostenloses OpenStreetMap-Konto benötigen.", "layers": { @@ -914,7 +1010,7 @@ "render": "Änderungssatz {id}" }, "theme-id": { - "question": "Welches Thema wurde für diese Änderung verwendet?\"", + "question": "Welches Thema wurde für diese Änderung verwendet?", "render": "Geändert mit Thema {theme}" }, "version": { @@ -1312,6 +1408,10 @@ "shortDescription": "Kartieren Sie alle Bäume", "title": "Bäume" }, + "vending_machine": { + "description": "Finde Verkaufautomaten für Alles", + "title": "Verkaufsautomaten" + }, "walls_and_buildings": { "description": "Spezielle Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist nützlich in Voreinstellungen für Objekte, die an Wänden platziert werden können (z. B. AEDs, Briefkästen, Eingänge, Adressen, Überwachungskameras, ...). Diese Ebene ist standardmäßig unsichtbar und kann vom Benutzer nicht umgeschaltet werden.", "title": "Wände und Gebäude" From ea8d6f8c96cb9f4dd2366d56ad50cb7ed990bc25 Mon Sep 17 00:00:00 2001 From: deep map Date: Fri, 21 Jul 2023 10:14:19 +0000 Subject: [PATCH 015/134] Translated using Weblate (German) Currently translated at 97.8% (2984 of 3050 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 437 ++++++++++++++++++++++--------------------- 1 file changed, 227 insertions(+), 210 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 16c39efa3..50794cf07 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -35,6 +35,16 @@ "1": { "title": "eine freistehende Posterbox" }, + "10": { + "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", + "title": "ein Schild" + }, + "11": { + "title": "eine Skulptur" + }, + "12": { + "title": "eine Wandmalerei" + }, "2": { "title": "eine wandmontierte Posterbox" }, @@ -61,16 +71,6 @@ }, "9": { "title": "ein Totem" - }, - "10": { - "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", - "title": "ein Schild" - }, - "11": { - "title": "eine Skulptur" - }, - "12": { - "title": "eine Wandmalerei" } }, "tagRenderings": { @@ -165,6 +165,9 @@ "1": { "then": "Dies ist ein Brett" }, + "10": { + "then": "Dies ist eine Wandmalerei" + }, "2": { "then": "Dies ist eine Litfaßsäule" }, @@ -188,9 +191,6 @@ }, "9": { "then": "Dies ist ein Totem" - }, - "10": { - "then": "Dies ist eine Wandmalerei" } }, "question": "Welche Art von Werbung ist das?", @@ -205,6 +205,9 @@ "1": { "then": "Brett" }, + "10": { + "then": "Wandmalerei" + }, "2": { "then": "Posterbox" }, @@ -228,9 +231,6 @@ }, "9": { "then": "Totem" - }, - "10": { - "then": "Wandmalerei" } } } @@ -312,6 +312,15 @@ "1": { "then": "Wandbild" }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" + }, "2": { "then": "Malerei" }, @@ -335,15 +344,6 @@ }, "9": { "then": "Relief" - }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1830,6 +1830,27 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" + }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1853,27 +1874,6 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" - }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1929,30 +1929,6 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" - }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1983,6 +1959,9 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -2013,11 +1992,32 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3555,6 +3555,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3578,15 +3587,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3635,6 +3635,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3658,15 +3667,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4606,30 +4606,6 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." - }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4660,6 +4636,9 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4674,6 +4653,27 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4780,6 +4780,21 @@ "1": { "then": "Dies ist eine Pommesbude" }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" + }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4803,21 +4818,6 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" - }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Was für Essen gibt es hier?", @@ -5633,9 +5633,15 @@ }, "map_size": { "mappings": { + "0": { + "then": "Eine Karte der Räume innerhalb eines Gebäudes" + }, "1": { "then": "Örtlichkeit (z.B. Burg)" }, + "2": { + "then": "Eine Karte, die das Dorf oder die Stadt anzeigt" + }, "3": { "then": "Stadt" }, @@ -5646,6 +5652,17 @@ "question": "Was wird von der Fläche abgedeckt?" }, "map_type": { + "mappings": { + "0": { + "then": "Topographische Katte

Die Karte enthält Höhenlinien.

" + }, + "1": { + "then": "Eine Karte mit allen Straßen und Wegen eines Gebietes.

Die Straßen sind meist benannt; die Winkel, die Entfernungen, etc. stimmen

" + }, + "2": { + "then": "This is a schematic map.

A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.

" + } + }, "question": "Was für eine Karte ist das?" } }, @@ -6005,6 +6022,19 @@ } } }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } + }, "2": { "options": { "0": { @@ -6060,19 +6090,6 @@ "question": "Nur offene Notizen anzeigen" } } - }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } } }, "name": "OpenStreetMap-Hinweise", @@ -6401,6 +6418,21 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." + }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6424,21 +6456,6 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." - }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -7392,30 +7409,6 @@ "1": { "question": "Recycling von Batterien" }, - "2": { - "question": "Recycling von Getränkekartons" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" - }, "10": { "question": "Recycling von Glas" }, @@ -7446,11 +7439,35 @@ "19": { "question": "Recycling von Restabfällen" }, + "2": { + "question": "Recycling von Getränkekartons" + }, "20": { "question": "Recycling von Druckerpatronen" }, "21": { "question": "Recycling von Fahrrädern" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" } } }, @@ -7518,30 +7535,6 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" - }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -7572,6 +7565,9 @@ "19": { "then": "Schuhe können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -7586,6 +7582,27 @@ }, "24": { "then": "Fahrräder können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -8383,6 +8400,12 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" + }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -8406,12 +8429,6 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" - }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -9769,4 +9786,4 @@ } } } -} \ No newline at end of file +} From fadb05466fd6cff4c74e7c7cd938c9386d1adcf7 Mon Sep 17 00:00:00 2001 From: kjon Date: Sun, 23 Jul 2023 15:25:17 +0000 Subject: [PATCH 016/134] Translated using Weblate (German) Currently translated at 100.0% (450 of 450 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/ --- langs/themes/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/de.json b/langs/themes/de.json index 77c671f21..520448bfd 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1216,7 +1216,7 @@ "title": "Postleitzahlen" }, "postboxes": { - "description": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)
Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten. ", + "description": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)
Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten.", "shortDescription": "Eine Karte die Briefkästen und Poststellen anzeigt", "title": "Post- und Briefkastenkarte" }, From 213a1131b02071379c320b12c3a5600dc4264f65 Mon Sep 17 00:00:00 2001 From: kjon Date: Sun, 23 Jul 2023 15:28:12 +0000 Subject: [PATCH 017/134] Translated using Weblate (German) Currently translated at 100.0% (3050 of 3050 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 227 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 226 insertions(+), 1 deletion(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 50794cf07..8f3004998 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5660,7 +5660,10 @@ "then": "Eine Karte mit allen Straßen und Wegen eines Gebietes.

Die Straßen sind meist benannt; die Winkel, die Entfernungen, etc. stimmen

" }, "2": { - "then": "This is a schematic map.

A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.

" + "then": "Dies ist eine schematische Karte.

Eine skizzierte Karte mit nur wichtigen Wegen und POIs. Die Winkel, Entfernungen usw. sind lediglich illustrativ, nicht genau.

" + }, + "3": { + "then": "Dies ist ein Toposkop.

Eine Markierung, die an hohen Stellen angebracht ist und die Richtung zu wichtigen Landschaftsobjekten anzeigt, die von diesem Punkt aus gesehen werden können

" } }, "question": "Was für eine Karte ist das?" @@ -5883,6 +5886,17 @@ } } }, + "memorial": { + "tagRenderings": { + "inscription": { + "question": "Wie lautet die Inschrift auf dieser Gedenktafel?", + "render": "Die Inschrift auf dieser Gedenktafel lautet:

{inscription}

" + } + }, + "title": { + "render": "Gedenktafel" + } + }, "nature_reserve": { "description": "Ein Naturschutzgebiet ist ein Gebiet, das der Natur überlassen wurde", "filter": { @@ -6882,10 +6896,30 @@ "public_bookcase": { "description": "Ein Bücherschrank am Straßenrand mit Büchern, für jedermann zugänglich", "filter": { + "0": { + "options": { + "0": { + "question": "Hat Kinderbücher" + } + } + }, + "1": { + "options": { + "0": { + "question": "Hat Bücher für Erwachsene" + } + } + }, "2": { "options": { "0": { "question": "Innen oder Außen" + }, + "1": { + "question": "Befindet sich im Innenbereich" + }, + "2": { + "question": "Befindet sich im Freien" } } } @@ -8274,6 +8308,12 @@ }, "question": "Hat die Treppe einen Handlauf?" }, + "multilevels": { + "override": { + "question": "Zwischen welchen Stockwerken befindet sich diese Treppe?", + "render": "Diese Treppe ist zwischen den Stockwerken {level}" + } + }, "ramp": { "mappings": { "0": { @@ -8687,6 +8727,18 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" + }, + "1": { + "then": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart" + } + } + } + }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8900,6 +8952,11 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { + "opening_hours": { + "override": { + "question": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?" + } + }, "toilet-access": { "mappings": { "0": { @@ -9343,6 +9400,17 @@ } } }, + "fixate-north": { + "mappings": { + "0": { + "then": "Drehen der Karte zulassen" + }, + "1": { + "then": "Norden immer nach oben zeigen lassen" + } + }, + "question": "Soll Norden immer oben sein?" + }, "inbox": { "mappings": { "0": { @@ -9361,6 +9429,9 @@ } } }, + "mangrove-keys": { + "render": "Laden Sie den privaten Schlüssel für Ihr Mangrove-Konto herunter

Jeder, der diese Datei besitzt, kann mit Ihrer Identität Rezensionen vornehmen

" + }, "picture-license": { "mappings": { "0": { @@ -9468,6 +9539,160 @@ "render": "Einstellungen" } }, + "vending_machine": { + "description": "Ebene mit Verkaufsautomaten", + "filter": { + "1": { + "options": { + "0": { + "question": "Alle Verkaufsautomaten" + }, + "1": { + "question": "Verkauf von Getränken" + }, + "10": { + "question": "Verkauf von Milch" + }, + "11": { + "question": "Verkauf von Brot" + }, + "12": { + "question": "Verkauf von Eiern" + }, + "13": { + "question": "Verkauf von Käse" + }, + "14": { + "question": "Verkauf von Honig" + }, + "15": { + "question": "Verkauf von Kartoffeln" + }, + "16": { + "question": "Verkauf von Blumen" + }, + "2": { + "question": "Verkauf von Süßigkeiten" + }, + "3": { + "question": "Verkauf von Lebensmitteln" + }, + "4": { + "question": "Verkauf von Zigaretten" + }, + "5": { + "question": "Verkauf von Kondomen" + }, + "6": { + "question": "Verkauf von Kaffee" + }, + "7": { + "question": "Verkauf von Trinkwasser" + }, + "8": { + "question": "Verkauf von Zeitungen" + }, + "9": { + "question": "Verkauf von Fahrradschläuchen" + } + } + } + }, + "name": "Verkaufsautomaten", + "presets": { + "0": { + "title": "ein Verkaufsautomat" + } + }, + "tagRenderings": { + "indoor": { + "mappings": { + "0": { + "then": "Dieser Automat befindet sich im Freien" + }, + "1": { + "then": "Dieser Verkaufsautomat befindet sich im Innenbereich" + }, + "2": { + "then": "Dieser Automat befindet sich im Freien" + } + }, + "question": "Ist dieser Automat in einem Gebäude untergebracht?" + }, + "operator": { + "freeform": { + "placeholder": "Name des Betreibers" + }, + "question": "Wer betreibt diesen Verkaufsautomaten?", + "render": "Dieser Verkaufsautomat wird betrieben von {operator}" + }, + "vending": { + "mappings": { + "0": { + "then": "Getränke werden verkauft" + }, + "1": { + "then": "Süßigkeiten werden verkauft" + }, + "10": { + "then": "Brot wird verkauft" + }, + "11": { + "then": "Eier werden verkauft" + }, + "12": { + "then": "Käse wird verkauft" + }, + "13": { + "then": "Honig wird verkauft" + }, + "14": { + "then": "Kartoffeln werden verkauft" + }, + "15": { + "then": "Blumen werden verkauft" + }, + "2": { + "then": "Lebensmittel werden verkauft" + }, + "3": { + "then": "Zigaretten werden verkauft" + }, + "4": { + "then": "Kondome werden verkauft" + }, + "5": { + "then": "Kaffee wird verkauft" + }, + "6": { + "then": "Trinkwasser wird verkauft" + }, + "7": { + "then": "Zeitungen werden verkauft" + }, + "8": { + "then": "Fahrradschläuche werden verkauft" + }, + "9": { + "then": "Milch wird verkauft" + } + }, + "question": "Was wird in diesem Automaten verkauft?", + "render": "Dieser Automat verkauft {vending}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Verkaufsautomat {name}" + }, + "1": { + "then": "Verkaufsautomat {brand}" + } + }, + "render": "Verkaufsautomat" + } + }, "veterinary": { "name": "Tierärzte", "presets": { From 4131a678bab4e05cd834cf3b5bda789c30779f72 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 26 Jul 2023 14:12:47 +0000 Subject: [PATCH 018/134] Translated using Weblate (Dutch) Currently translated at 100.0% (502 of 502 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/ --- langs/nl.json | 69 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/langs/nl.json b/langs/nl.json index 85206ce66..8851cf4fe 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -1,6 +1,11 @@ { + "advanced": { + "title": "Geavanceerde functies" + }, "centerMessage": { + "allFilteredAway": "Geen enkel kaart-object voldoet aan alle filters", "loadingData": "Data wordt geladen…", + "noData": "Er zijn geen relevante kaart-objecten in de zichtbare regio", "ready": "Klaar!", "retrying": "Data inladen mislukt - wordt opnieuw geprobeerd over {count} seconden", "zoomIn": "Zoom in om de data te zien en te bewerken" @@ -61,7 +66,7 @@ "attributes": "Attributen worden getoond op begrijpbare wijze", "edit": "Foute of verouderde gegevens? Aanpassen kan hier.", "question": "Is een attribuut nog niet gekend?\nMapComplete toont een vraag", - "see_images": "Toont afbeeldingen van eerdere bijdragers, Wikipedia, Mapillary, ... ", + "see_images": "Toont afbeeldingen van eerdere bijdragers, Wikipedia, Mapillary, …", "wikipedia": "Gelinkte Wikipedia-artikelen worden getoond" }, "frontParagraph": "MapComplete is een web-applicatie om OpenStreetMap-data te tonen en aan te passen op thematische kaarten.\nHet maakt het mogelijk om open geodata te crowdsourcen en te managen op een makkelijke manier.\n\nNieuwe categorieën en attributen kunnen op vraag worden toegevoegd.", @@ -87,15 +92,21 @@ "whatIsOsm": "Wat is OpenStreetMap?" }, "general": { + "404": "Deze pagina bestaat niet", "about": "Bewerk en voeg data toe aan OpenStreetMap over een specifiek onderwerp op een gemakkelijke manier", + "aboutMapComplete": { + "intro": "Gebruik MapComplete om data uit OpenStreetMap te bekijken en te bewerken rond een specifiek thema. Beantwoord vragen en binnen enkele minuten zijn je antwoorden overal beschikbaar. In de meeste thema's kan je ook foto's toevoegen of zelfs een review schrijven. De maker van het thema bepaalt welke elementen en vragen getoond worden." + }, "add": { "addNew": "Voeg {category} toe", "backToSelect": "Selecteer een andere categorie", "confirmButton": "Voeg een {category} toe
Je toevoeging is voor iedereen zichtbaar
", + "confirmLocation": "Bevestig deze locatie", "confirmTitle": "Voeg een {title} toe?", "confirmWarning": "Het object dat je toevoegt, is zichtbaar voor iedereen. Veel applicaties gebruiken deze data, voeg dus enkel punten toe die echt bestaan.", "disableFilters": "Zet alle filters af", "disableFiltersExplanation": "Interessepunten kunnen verborgen zijn door een filter", + "enableLayer": "Schakel laag {name} in", "hasBeenImported": "Dit object is reeds geïmporteerd", "import": { "hasBeenImported": "Dit object is geïmporteerd", @@ -124,6 +135,8 @@ "isApplied": "De wijzigingen zijn doorgevoerd" }, "attribution": { + "attributionBackgroundLayer": "De huidige achtergrondlaag is {name}", + "attributionBackgroundLayerWithCopyright": "De huidige achtergrondlaag is {name} : {copyright}", "attributionContent": "

Alle data is voorzien door OpenStreetMap, gratis en vrij te hergebruiken onder de Open DataBase Licentie.

", "attributionTitle": "Met dank aan", "codeContributionsBy": "MapComplete is gebouwd door {contributors} en {hiddenCount} andere bijdragers", @@ -144,19 +157,23 @@ "openMapillary": "Open Mapillary op deze locatie", "openOsmcha": "Bekijk de laatste bijdragen gemaakt met {theme}", "themeBy": "Thema gemaakt door {author}", + "title": "Copyright en attributie", "translatedBy": "MapComplete werd vertaald door {contributors} en {hiddenCount} meer vertalers" }, "back": "Vorige", "backToIndex": "Keer terug naar het overzicht met alle thematische kaarten", "backgroundMap": "Selecteer een achtergrondlaag", + "backgroundSwitch": "Verander achtergrond", "cancel": "Annuleren", "confirm": "Bevestigen", "customThemeIntro": "

Onofficiële thema's

De onderstaande thema's heb je eerder bezocht en zijn gemaakt door andere OpenStreetMappers.", "download": { "downloadAsPdf": "Download een PDF van de huidig zichtbare kaart", "downloadAsPdfHelper": "Perfect om de huidige kaart af te printen", + "downloadAsPng": "Download als afbeelding", + "downloadAsPngHelper": "Perfect om in rapporten op te nemen", "downloadAsSvg": "Download de huidige kaart als SVG", - "downloadAsSvgHelper": "Compatibel met Inkscape of Adobe Illustrator; deze data moeten nog verder verwerkt worden… ", + "downloadAsSvgHelper": "Compatibel met Inkscape of Adobe Illustrator; deze data moeten nog verder verwerkt worden…", "downloadCSV": "Download de zichtbare data als CSV", "downloadCSVHelper": "Compatibel met LibreOffice Calc, Excel, …", "downloadFeatureAsGeojson": "Downloaden als GeoJSON bestand", @@ -169,7 +186,11 @@ "includeMetaData": "Exporteer metadata (zoals laatste aanpassing, berekende waardes, …)", "licenseInfo": "

Copyright

De voorziene data is beschikbaar onder de ODbL. Het hergebruiken van deze data is gratis voor elke toepassing, maar
  • de bronvermelding © OpenStreetMap bijdragers is vereist
  • Elke wijziging aan deze data moet opnieuw gepubliceerd worden onder dezelfde licentie
Gelieve de volledige licentie te lezen voor details", "noDataLoaded": "Er is nog geen data ingeladen. Downloaden kan zodra de data geladen is.", - "title": "Download de zichtbare data", + "pdf": { + "current_view_a3": "Exporteer de zichtbare regio als PDF (A3, staand)", + "current_view_a4": "Exporteer de zichtbare regio als PDF (A4, liggend)" + }, + "title": "Download", "uploadGpx": "Track uploaden naar OpenStreetMap" }, "error": "Er ging iets mis", @@ -200,12 +221,16 @@ "loginToStart": "Meld je aan om deze vraag te beantwoorden", "loginWithOpenStreetMap": "Aanmelden met OpenStreetMap", "logout": "Afmelden", + "menu": { + "aboutMapComplete": "Over MapComplete", + "filter": "Filter data" + }, "morescreen": { "createYourOwnTheme": "Maak je eigen MapComplete-kaart", "enterToOpen": "Druk op enter om thema te openen", "hiddenExplanation": "Deze thema's zijn enkel zichtbaar indien je de link kent. Je hebt {hidden_discovered} van {total_hidden} verborgen thema's ontdekt.", "intro": "

Meer thematische kaarten?

Vind je het leuk om geodata te verzamelen?
Hier vind je meer kaartthema's.", - "noMatchingThemes": "Geen enkel thema beantwoord je zoekopdracht", + "noMatchingThemes": "Geen enkel thema beantwoordt je zoekopdracht", "noSearch": "Toon alle thema's", "previouslyHiddenTitle": "Eerder bezochte verborgen themas", "requestATheme": "Als je een eigen kaartthema wil, vraag dit dan in de issue tracker.", @@ -246,6 +271,18 @@ }, "pickLanguage": "Kies je taal: ", "poweredByOsm": "Gebouwd met OpenStreetMap", + "questionBox": { + "answeredMultiple": "Je beantwoordde {answered} vragen", + "answeredMultipleSkippedMultiple": "Je beantwoorde {answered} vragen en sloeg {skipped} vragen over", + "answeredMultipleSkippedOne": "Je beantwoorde {answered} vragen en sloeg er één over", + "answeredOne": "Je beantwoordde één vraag", + "answeredOneSkippedMultiple": "Je beantwoordde één vraag en sloeg er één over", + "answeredOneSkippedOne": "Je beantwoorde één vraag en sloeg een andere vraag over", + "done": "Geen verdere vragen! Bedankt!", + "reactivate": "Heractiveer vragen die je oversloeg", + "skippedMultiple": "Je hebt {skipped} vragen overgeslaan", + "skippedOne": "Je hebt één vraag beantwoord" + }, "questions": { "emailIs": "Het email-adres van {category} is {email}", "emailOf": "Wat is het email-adres van {category}?", @@ -285,7 +322,8 @@ "fsUserbadge": "Activeer de login-knop", "fsWelcomeMessage": "Toon het welkomstbericht en de bijhorende tabbladen", "intro": "

Deel deze kaart

Kopieer onderstaande link om deze kaart naar vrienden en familie door te sturen:", - "thanksForSharing": "Bedankt om te delen!" + "thanksForSharing": "Bedankt om te delen!", + "title": "Deel deze kaart" }, "skip": "Sla deze vraag over", "testing": "Testmode - wijzigingen worden niet opgeslaan", @@ -342,6 +380,7 @@ "general": "Op deze kaart kan je interessepunten bekijken, bewerken en toevoegen. Zoom in om de interessepunten te zien, duid eentje aan om alle informatie te zien en te bewerken. Alle informatie komt van OpenStreetMap die gratis hergebruikt mag worden." }, "wikipedia": { + "addEntry": "Voeg een andere Wikipedia-pagina toe", "createNewWikidata": "Maak een nieuw Wikidata-item", "doSearch": "Zoek hierboven om resultaten te zien", "failed": "Het Wikipedia-artikel inladen is mislukt", @@ -364,8 +403,11 @@ "geolocate": "Centreer de map op je huidige positie of zoom verder in naar de huidige positie. Vraagt geolocatie-toegang", "intro": "MapComplete ondersteunt de volgende sneltoetsen:", "key": "Toets-combinatie", - "openLayersPanel": "Open het paneel met lagen, filters en achtergrondkaart", - "selectMapnik": "Selecteer OpenStreetMap-carto als achtergrondlaag", + "openLayersPanel": "Open het paneel met lagen en filters", + "selectAerial": "Verander de achtergrondlaag naar luchtfoto's of satelietfoto's. Wisselt tussen de twee beste, beschikbare lagen", + "selectMap": "Gebruik een niet-OpenStreetMap-gebaseerde kaart als achtergrond. Wisselt tussen de twee beste, beschikbare lagen", + "selectMapnik": "Gebruik OpenStreetMap-carto als achtergrondlaag", + "selectOsmbasedmap": "Gebruik een OpenStreetMap-gebaseerde achtergrondkaart (of schakel de achtergrond-rasterlaag uit)", "selectSearch": "Selecteer de zoekbalk om locaties te zoeken", "title": "Sneltoetsen" }, @@ -457,6 +499,7 @@ "createNote": "Maak een nieuwe kaartnota", "createNoteIntro": "Ontbreekt hier iets? Is hier iets mis met de kaart? Maak hier dan een kaartnota, deze zal door vrijwilligers verwerkt worden.", "createNoteTitle": "Voeg hier een nieuwe kaartnota toe", + "creating": "Kaartnota wordt gemaakt…", "disableAllNoteFilters": "Schakel alle filters uit", "isClosed": "Deze nota is gesloten", "isCreated": "Je kaarnota werd gemaakt!", @@ -487,7 +530,7 @@ }, "loadingWikidata": "Informatie over {species} aan het laden", "matchPercentage": "{match}% overeenkomst", - "overviewIntro": "De AI van PlantNet.org denkt dat het om één van deze soorten gaat.", + "overviewIntro": "De AI van plantnet.org denkt dat het om één van deze soorten gaat.", "overviewTitle": "Gedetecteerd plantensoorten", "overviewVerify": "Verifieer dat het de juiste soort is en link dit aan de boom", "poweredByPlantnet": "Met dank aan plantnet.org", @@ -518,12 +561,13 @@ "no_reviews_yet": "Er zijn nog geen beoordelingen. Wees de eerste om een beoordeling te schrijven en help open data en het bedrijf!", "plz_login": "Meld je aan om een beoordeling te geven", "posting_as": "Ingelogd als", + "save": "Opslaan", "saved": "Bedankt om je beoordeling te delen!", "saving_review": "Opslaan...", "title": "{count} beoordelingen", "title_singular": "Eén beoordeling", "tos": "Als je je review publiceert, ga je akkoord met de de gebruiksvoorwaarden en privacy policy van Mangrove.reviews", - "write_a_comment": "Schrijf een beoordeling..." + "write_a_comment": "Schrijf een beoordeling…" }, "split": { "cancel": "Annuleren", @@ -541,10 +585,12 @@ "notImmediate": "Vertalingen worden niet onmiddelijk geupdate. Dit duurt gemiddeld enkele dagen" }, "userinfo": { + "editDescription": "Pas je profielbeschrijving aan", "gotoInbox": "Open je inbox", "gotoSettings": "Ga naar je instellingen op OpenStreetMap.org", "noDescription": "Je hebt nog geen beschrijving op je profiel", - "noDescriptionCallToAction": "Voeg een profielbeschrijving toe" + "noDescriptionCallToAction": "Voeg een profielbeschrijving toe", + "notLoggedIn": "Je bent afgemeld" }, "validation": { "color": { @@ -585,7 +631,8 @@ }, "phone": { "description": "telefoonnummer", - "feedback": "Dit is geen geldig telefoonnummer" + "feedback": "Dit is geen geldig telefoonnummer", + "feedbackCountry": "Dit is geen geldig telefoonnummer (voor het land {country})" }, "pnat": { "description": "een positief, geheel getal", From 89027ed516ca382c2328a7936152b0ba4d2dc34b Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 02:03:56 +0200 Subject: [PATCH 019/134] Chore: fix and merge translations --- assets/layers/advertising/advertising.json | 9 +- .../layers/climbing_route/climbing_route.json | 4 +- assets/layers/map/map.json | 18 +- assets/layers/memorial/memorial.json | 9 +- .../public_bookcase/public_bookcase.json | 12 +- assets/layers/usersettings/usersettings.json | 12 +- .../vending_machine/vending_machine.json | 144 +++-- assets/themes/climbing/climbing.json | 21 +- .../themes/elongated_coin/elongated_coin.json | 87 ++- .../mapcomplete-changes.json | 97 +++- assets/themes/postboxes/postboxes.json | 4 +- .../vending_machine/vending_machine.json | 6 +- langs/en.json | 2 +- langs/layers/de.json | 521 +++++++++--------- langs/layers/en.json | 7 + langs/layers/fr.json | 214 +++---- langs/nl.json | 2 +- langs/themes/de.json | 64 +-- langs/themes/en.json | 64 +-- 19 files changed, 717 insertions(+), 580 deletions(-) diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json index 70b105566..0621d8255 100644 --- a/assets/layers/advertising/advertising.json +++ b/assets/layers/advertising/advertising.json @@ -1014,7 +1014,8 @@ "es": "una valla publicitària", "de": "eine Werbetafel", "cs": "billboard", - "pt": "um outdoor" + "pt": "um outdoor", + "fr": "un grand panneau" }, "description": { "en": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads", @@ -1041,7 +1042,8 @@ "es": "un mupi", "de": "eine freistehende Posterbox", "cs": "volně stojící plakátovací skříň", - "pt": "uma caixa de pôster independente" + "pt": "uma caixa de pôster independente", + "fr": "un panneau à affiches scellé au sol" }, "exampleImages": [ "./assets/themes/advertising/Mupi_spain.jpg", @@ -1058,7 +1060,8 @@ "es": "un mupi sobre la pared", "de": "eine wandmontierte Posterbox", "cs": "plakátovací skříň připevněná na stěnu", - "pt": "uma caixa de pôster montada em uma parede" + "pt": "uma caixa de pôster montada em uma parede", + "fr": "un panneau à affiches monté sur un mur" }, "snapToLayer": "walls_and_buildings" }, diff --git a/assets/layers/climbing_route/climbing_route.json b/assets/layers/climbing_route/climbing_route.json index df6718eaa..2183d5370 100644 --- a/assets/layers/climbing_route/climbing_route.json +++ b/assets/layers/climbing_route/climbing_route.json @@ -210,7 +210,9 @@ "de": "eine Kletterroute", "it": "una via di arrampicata" }, - "snapToLayer": ["climbing_opportunity"], + "snapToLayer": [ + "climbing_opportunity" + ], "tags": [ "sport=climbing", "climbing=route" diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index 12447093c..ceb3502ad 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -53,25 +53,29 @@ { "if": "map_type=topo", "then": { - "en": "Topographical map

The map contains contour lines.

" + "en": "Topographical map

The map contains contour lines.

", + "de": "Topographische Katte

Die Karte enthält Höhenlinien.

" } }, { "if": "map_type=street", "then": { - "en": "A map with all streets or ways of an area.

The streets are mostly named; the angles, distances etc. are accurate

" + "en": "A map with all streets or ways of an area.

The streets are mostly named; the angles, distances etc. are accurate

", + "de": "Eine Karte mit allen Straßen und Wegen eines Gebietes.

Die Straßen sind meist benannt; die Winkel, die Entfernungen, etc. stimmen

" } }, { "if": "map_type=scheme", "then": { - "en": "This is a schematic map.

A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.

" + "en": "This is a schematic map.

A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.

", + "de": "Dies ist eine schematische Karte.

Eine skizzierte Karte mit nur wichtigen Wegen und POIs. Die Winkel, Entfernungen usw. sind lediglich illustrativ, nicht genau.

" } }, { "if": "map_type=toposcope", "then": { - "en": "This is a toposcope.

A marker erected on high places which indicates the direction to notable landscape features which can be seen from that point

" + "en": "This is a toposcope.

A marker erected on high places which indicates the direction to notable landscape features which can be seen from that point

", + "de": "Dies ist ein Toposkop.

Eine Markierung, die an hohen Stellen angebracht ist und die Richtung zu wichtigen Landschaftsobjekten anzeigt, die von diesem Punkt aus gesehen werden können

" } } ] @@ -86,7 +90,8 @@ { "if": "map_size=building", "then": { - "en": "A map of the rooms within a building" + "en": "A map of the rooms within a building", + "de": "Eine Karte der Räume innerhalb eines Gebäudes" } }, { @@ -99,7 +104,8 @@ { "if": "map_size=village", "then": { - "en": "A map showing the village or town" + "en": "A map showing the village or town", + "de": "Eine Karte, die das Dorf oder die Stadt anzeigt" } }, { diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json index 9515842e9..2a9dedca3 100644 --- a/assets/layers/memorial/memorial.json +++ b/assets/layers/memorial/memorial.json @@ -6,17 +6,20 @@ }, "title": { "render": { - "en": "Memorial plaque" + "en": "Memorial plaque", + "de": "Gedenktafel" } }, "tagRenderings": [ { "id": "inscription", "question": { - "en": "What is the inscription of this plaque?" + "en": "What is the inscription of this plaque?", + "de": "Wie lautet die Inschrift auf dieser Gedenktafel?" }, "render": { - "en": "The inscription on this plaque reads:

{inscription}

" + "en": "The inscription on this plaque reads:

{inscription}

", + "de": "Die Inschrift auf dieser Gedenktafel lautet:

{inscription}

" }, "freeform": { "key": "inscription", diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 3faca922a..4ee12d8e0 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -480,7 +480,8 @@ { "question": { "en": "Has children books", - "nl": "Kinderboeken aanwezig" + "nl": "Kinderboeken aanwezig", + "de": "Hat Kinderbücher" }, "osmTags": "books~i~.*children.*" } @@ -492,7 +493,8 @@ { "question": { "en": "Has books for adults", - "nl": "Boeken voor volwassenen aanwezig" + "nl": "Boeken voor volwassenen aanwezig", + "de": "Hat Bücher für Erwachsene" }, "osmTags": "books~i~.*adults.*" } @@ -513,14 +515,16 @@ { "question": { "en": "Located indoors", - "nl": "Bevindt zich binnen" + "nl": "Bevindt zich binnen", + "de": "Befindet sich im Innenbereich" }, "osmTags": "indoor=yes" }, { "question": { "nl": "Bevindt zich buiten", - "en": "Located outdoors" + "en": "Located outdoors", + "de": "Befindet sich im Freien" }, "osmTags": { "or": [ diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index 196a3b2a3..2f4fa5671 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -233,19 +233,22 @@ { "id": "fixate-north", "question": { - "en": "Should north always be up?" + "en": "Should north always be up?", + "de": "Soll Norden immer oben sein?" }, "mappings": [ { "if": "mapcomplete-fixate-north=", "then": { - "en": "Allow to rotate the map" + "en": "Allow to rotate the map", + "de": "Drehen der Karte zulassen" } }, { "if": "mapcomplete-fixate-north=yes", "then": { - "en": "Always keep north pointing up" + "en": "Always keep north pointing up", + "de": "Norden immer nach oben zeigen lassen" } } ] @@ -253,7 +256,8 @@ { "id": "mangrove-keys", "render": { - "en": "Download the private key for your Mangrove Account

Anyone possessing this file can make reviews with your identity

" + "en": "Download the private key for your Mangrove Account

Anyone possessing this file can make reviews with your identity

", + "de": "Laden Sie den privaten Schlüssel für Ihr Mangrove-Konto herunter

Jeder, der diese Datei besitzt, kann mit Ihrer Identität Rezensionen vornehmen

" } }, { diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json index a8452594e..ace99ea95 100644 --- a/assets/layers/vending_machine/vending_machine.json +++ b/assets/layers/vending_machine/vending_machine.json @@ -2,11 +2,13 @@ "id": "vending_machine", "name": { "en": "Vending Machines", - "nl": "Verkoopautomaten" + "nl": "Verkoopautomaten", + "de": "Verkaufsautomaten" }, "description": { "en": "Layer showing vending machines", - "nl": "Laag met verkoopautomaten" + "nl": "Laag met verkoopautomaten", + "de": "Ebene mit Verkaufsautomaten" }, "source": { "osmTags": { @@ -19,21 +21,24 @@ "title": { "render": { "en": "Vending machine", - "nl": "Verkoopautomaat" + "nl": "Verkoopautomaat", + "de": "Verkaufsautomat" }, "mappings": [ { "if": "name~*", "then": { "en": "Vending machine {name}", - "nl": "Verkoopautomaat {name}" + "nl": "Verkoopautomaat {name}", + "de": "Verkaufsautomat {name}" } }, { "if": "brand~*", "then": { "en": "Vending machine {brand}", - "nl": "Verkoopautomaat {brand}" + "nl": "Verkoopautomaat {brand}", + "de": "Verkaufsautomat {brand}" } } ] @@ -44,7 +49,8 @@ "id": "vending", "question": { "en": "What does this vending machine sell?", - "nl": "Wat verkoopt deze verkoopautomaat?" + "nl": "Wat verkoopt deze verkoopautomaat?", + "de": "Was wird in diesem Automaten verkauft?" }, "freeform": { "key": "vending", @@ -54,14 +60,16 @@ }, "render": { "en": "This vending machine sells {vending}", - "nl": "Deze verkoopautomaat verkoopt {vending}" + "nl": "Deze verkoopautomaat verkoopt {vending}", + "de": "Dieser Automat verkauft {vending}" }, "mappings": [ { "if": "vending=drinks", "then": { "en": "Drinks are sold", - "nl": "Dranken worden verkocht" + "nl": "Dranken worden verkocht", + "de": "Getränke werden verkauft" }, "icon": "./assets/layers/id_presets/temaki-bottles.svg" }, @@ -69,7 +77,8 @@ "if": "vending=sweets", "then": { "en": "Sweets are sold", - "nl": "Snoep wordt verkocht" + "nl": "Snoep wordt verkocht", + "de": "Süßigkeiten werden verkauft" }, "icon": "./assets/layers/id_presets/maki-confectionery.svg" }, @@ -77,7 +86,8 @@ "if": "vending=food", "then": { "en": "Food is sold", - "nl": "Eten wordt verkocht" + "nl": "Eten wordt verkocht", + "de": "Lebensmittel werden verkauft" }, "icon": "./assets/layers/vending_machine/utensils.svg" }, @@ -85,7 +95,8 @@ "if": "vending=cigarettes", "then": { "en": "Cigarettes are sold", - "nl": "Sigaretten worden verkocht" + "nl": "Sigaretten worden verkocht", + "de": "Zigaretten werden verkauft" }, "icon": "./assets/layers/vending_machine/smoking.svg" }, @@ -93,14 +104,16 @@ "if": "vending=condoms", "then": { "en": "Condoms are sold", - "nl": "Condooms worden verkocht" + "nl": "Condooms worden verkocht", + "de": "Kondome werden verkauft" } }, { "if": "vending=coffee", "then": { "en": "Coffee is sold", - "nl": "Koffie wordt verkocht" + "nl": "Koffie wordt verkocht", + "de": "Kaffee wird verkauft" }, "icon": "./assets/layers/vending_machine/mug-saucer.svg" }, @@ -108,7 +121,8 @@ "if": "vending=water", "then": { "en": "Drinking water is sold", - "nl": "Drinkwater wordt verkocht" + "nl": "Drinkwater wordt verkocht", + "de": "Trinkwasser wird verkauft" }, "icon": "./assets/layers/id_presets/temaki-water_bottle.svg" }, @@ -116,7 +130,8 @@ "if": "vending=newspapers", "then": { "en": "Newspapers are sold", - "nl": "Kranten worden verkocht" + "nl": "Kranten worden verkocht", + "de": "Zeitungen werden verkauft" }, "icon": "./assets/layers/id_presets/fas-newspaper.svg" }, @@ -124,14 +139,16 @@ "if": "vending=bicycle_tube", "then": { "en": "Bicycle inner tubes are sold", - "nl": "Binnenbanden voor fietsen worden verkocht" + "nl": "Binnenbanden voor fietsen worden verkocht", + "de": "Fahrradschläuche werden verkauft" } }, { "if": "vending=milk", "then": { "en": "Milk is sold", - "nl": "Melk wordt verkocht" + "nl": "Melk wordt verkocht", + "de": "Milch wird verkauft" }, "icon": "./assets/layers/vending_machine/cow.svg" }, @@ -139,7 +156,8 @@ "if": "vending=bread", "then": { "en": "Bread is sold", - "nl": "Brood wordt verkocht" + "nl": "Brood wordt verkocht", + "de": "Brot wird verkauft" }, "icon": "./assets/layers/id_presets/maki-bakery.svg" }, @@ -147,7 +165,8 @@ "if": "vending=eggs", "then": { "en": "Eggs are sold", - "nl": "Eieren worden verkocht" + "nl": "Eieren worden verkocht", + "de": "Eier werden verkauft" }, "icon": "./assets/layers/vending_machine/egg.svg" }, @@ -155,7 +174,8 @@ "if": "vending=cheese", "then": { "en": "Cheese is sold", - "nl": "Kaas wordt verkocht" + "nl": "Kaas wordt verkocht", + "de": "Käse wird verkauft" }, "icon": "./assets/layers/id_presets/fas-cheese.svg" }, @@ -163,7 +183,8 @@ "if": "vending=honey", "then": { "en": "Honey is sold", - "nl": "Honing wordt verkocht" + "nl": "Honing wordt verkocht", + "de": "Honig wird verkauft" }, "icon": "./assets/layers/vending_machine/honey.svg" }, @@ -171,7 +192,8 @@ "if": "vending=potatoes", "then": { "en": "Potatoes are sold", - "nl": "Aardappelen worden verkocht" + "nl": "Aardappelen worden verkocht", + "de": "Kartoffeln werden verkauft" }, "icon": "./assets/layers/vending_machine/potato.svg" }, @@ -179,7 +201,8 @@ "if": "vending=flowers", "then": { "en": "Flowers are sold", - "nl": "Bloemen worden verkocht" + "nl": "Bloemen worden verkocht", + "de": "Blumen werden verkauft" }, "icon": "./assets/layers/id_presets/maki-florist.svg" } @@ -194,32 +217,37 @@ "id": "operator", "question": { "en": "Who operates this vending machine?", - "nl": "Wie beheert deze verkoopautomaat?" + "nl": "Wie beheert deze verkoopautomaat?", + "de": "Wer betreibt diesen Verkaufsautomaten?" }, "freeform": { "key": "operator", "placeholder": { "en": "Name of operator", - "nl": "Naam van beheerder" + "nl": "Naam van beheerder", + "de": "Name des Betreibers" } }, "render": { "en": "This vending machine is operated by {operator}", - "nl": "Deze verkoopautomaat wordt beheerd door {operator}" + "nl": "Deze verkoopautomaat wordt beheerd door {operator}", + "de": "Dieser Verkaufsautomat wird betrieben von {operator}" } }, { "id": "indoor", "question": { "en": "Is this vending machine indoors?", - "nl": "Is deze verkoopautomaat binnen?" + "nl": "Is deze verkoopautomaat binnen?", + "de": "Ist dieser Automat in einem Gebäude untergebracht?" }, "mappings": [ { "if": "indoor=", "then": { "en": "This vending machine is outdoors", - "nl": "Deze verkoopautomaat is buiten" + "nl": "Deze verkoopautomaat is buiten", + "de": "Dieser Automat befindet sich im Freien" }, "hideInAnswer": true }, @@ -227,14 +255,16 @@ "if": "indoor=yes", "then": { "en": "This vending machine is indoors", - "nl": "Deze verkoopautomaat is binnen" + "nl": "Deze verkoopautomaat is binnen", + "de": "Dieser Verkaufsautomat befindet sich im Innenbereich" } }, { "if": "indoor=no", "then": { "en": "This vending machine is outdoors", - "nl": "Deze verkoopautomaat is buiten" + "nl": "Deze verkoopautomaat is buiten", + "de": "Dieser Automat befindet sich im Freien" } } ] @@ -248,7 +278,8 @@ { "title": { "en": "a vending machine", - "nl": "een verkoopautomaat" + "nl": "een verkoopautomaat", + "de": "ein Verkaufsautomat" }, "tags": [ "amenity=vending_machine" @@ -464,118 +495,135 @@ { "question": { "en": "All vending machines", - "nl": "Alle verkoopautomaten" + "nl": "Alle verkoopautomaten", + "de": "Alle Verkaufsautomaten" } }, { "question": { "en": "Sale of drinks", - "nl": "Verkoop van dranken" + "nl": "Verkoop van dranken", + "de": "Verkauf von Getränken" }, "osmTags": "vending~i~.*drinks.*" }, { "question": { "en": "Sale of sweets", - "nl": "Verkoop van snoep" + "nl": "Verkoop van snoep", + "de": "Verkauf von Süßigkeiten" }, "osmTags": "vending~i~.*sweets.*" }, { "question": { "en": "Sale of food", - "nl": "Verkoop van eten" + "nl": "Verkoop van eten", + "de": "Verkauf von Lebensmitteln" }, "osmTags": "vending~i~.*food.*" }, { "question": { "en": "Sale of cigarettes", - "nl": "Verkoop van sigaretten" + "nl": "Verkoop van sigaretten", + "de": "Verkauf von Zigaretten" }, "osmTags": "vending~i~.*cigarettes.*" }, { "question": { "en": "Sale of condoms", - "nl": "Verkoop van condooms" + "nl": "Verkoop van condooms", + "de": "Verkauf von Kondomen" }, "osmTags": "vending~i~.*condoms.*" }, { "question": { "en": "Sale of coffee", - "nl": "Verkoop van koffie" + "nl": "Verkoop van koffie", + "de": "Verkauf von Kaffee" }, "osmTags": "vending~i~.*coffee.*" }, { "question": { "en": "Sale of water", - "nl": "Verkoop van water" + "nl": "Verkoop van water", + "de": "Verkauf von Trinkwasser" }, "osmTags": "vending~i~.*water.*" }, { "question": { "en": "Sale of newspapers", - "nl": "Verkoop van kranten" + "nl": "Verkoop van kranten", + "de": "Verkauf von Zeitungen" }, "osmTags": "vending~i~.*newspapers.*" }, { "question": { "en": "Sale of bicycle inner tubes", - "nl": "Verkoop van fietsbinnenbanden" + "nl": "Verkoop van fietsbinnenbanden", + "de": "Verkauf von Fahrradschläuchen" }, "osmTags": "vending~i~.*bicycle_tube.*" }, { "question": { "en": "Sale of milk", - "nl": "Verkoop van melk" + "nl": "Verkoop van melk", + "de": "Verkauf von Milch" }, "osmTags": "vending~i~.*milk.*" }, { "question": { "en": "Sale of bread", - "nl": "Verkoop van brood" + "nl": "Verkoop van brood", + "de": "Verkauf von Brot" }, "osmTags": "vending~i~.*bread.*" }, { "question": { "en": "Sale of eggs", - "nl": "Verkoop van eieren" + "nl": "Verkoop van eieren", + "de": "Verkauf von Eiern" }, "osmTags": "vending~i~.*eggs.*" }, { "question": { "en": "Sale of cheese", - "nl": "Verkoop van kaas" + "nl": "Verkoop van kaas", + "de": "Verkauf von Käse" }, "osmTags": "vending~i~.*cheese.*" }, { "question": { "en": "Sale of honey", - "nl": "Verkoop van honing" + "nl": "Verkoop van honing", + "de": "Verkauf von Honig" }, "osmTags": "vending~i~.*honey.*" }, { "question": { "en": "Sale of potatoes", - "nl": "Verkoop van aardappelen" + "nl": "Verkoop van aardappelen", + "de": "Verkauf von Kartoffeln" }, "osmTags": "vending~i~.*potatoes.*" }, { "question": { "en": "Sale of flowers", - "nl": "Verkoop van bloemen" + "nl": "Verkoop van bloemen", + "de": "Verkauf von Blumen" }, "osmTags": "vending~i~.*flowers.*" } diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index c39e44264..0de35b92b 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -361,19 +361,22 @@ { "id": "repairs_climbing_shoes", "question": { - "en": "Does this shoe repair shop repair climbing shoes?" + "en": "Does this shoe repair shop repair climbing shoes?", + "de": "Repariert das Schuhgeschäft Kletterschuhe?" }, "mappings": [ { "if": "service:repair:climbing_shoes=yes", "then": { - "en": "This shop repairs climbing shoes" + "en": "This shop repairs climbing shoes", + "de": "Dieser Laden repariert Kletterschuhe" } }, { "if": "service:repair:climbing_shoes=no", "then": { - "en": "This shop does not repair climbing shoes" + "en": "This shop does not repair climbing shoes", + "de": "Dieser Shop repariert keine Kletterschuhe" } } ] @@ -397,19 +400,22 @@ { "id": "repairs_climbing_shoes", "question": { - "en": "Does this shoe repair shop also repair clibming shoes?" + "en": "Does this shoe repair shop also repair clibming shoes?", + "de": "Repariert dieses Schuhgeschäft auch Kletterschuhe?" }, "mappings": [ { "if": "service:repair:climbing_shoes=yes", "then": { - "en": "This shop repairs climbing shoes" + "en": "This shop repairs climbing shoes", + "de": "Dieses Geschäft repariert Kletterschuhe" } }, { "if": "service:repair:climbing_shoes=no", "then": { - "en": "This shop does not repair climbing shoes" + "en": "This shop does not repair climbing shoes", + "de": "Dieses Geschäft repariert keine Kletterschuhe" } } ] @@ -421,7 +427,8 @@ "shop=shoe_repair" ], "title": { - "en": "a shoe repair shop" + "en": "a shoe repair shop", + "de": "Ein Schuhmacher" } } ] diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json index 0449eaee5..627ce25b4 100644 --- a/assets/themes/elongated_coin/elongated_coin.json +++ b/assets/themes/elongated_coin/elongated_coin.json @@ -1,20 +1,24 @@ { "id": "elongated_coin", "title": { - "en": "Penny Presses" + "en": "Penny Presses", + "de": "Münzpressen" }, "description": { - "en": "Find penny presses to create your own elongated coins." + "en": "Find penny presses to create your own elongated coins.", + "de": "Finde Münzpresse um deine eigenen Prägemünzen zu Pressen." }, "icon": "./assets/themes/elongated_coin/penny.svg", "layers": [ { "id": "elongated_coin", "name": { - "en": "Penny Presses" + "en": "Penny Presses", + "de": "Münzpressen" }, "description": { - "en": "Layer showing penny presses." + "en": "Layer showing penny presses.", + "de": "Ebene mit Münzpressen." }, "source": { "osmTags": { @@ -26,7 +30,8 @@ }, "title": { "render": { - "en": "Penny Press" + "en": "Penny Press", + "de": "Münzpresse" } }, "tagRenderings": [ @@ -35,41 +40,48 @@ { "id": "designs", "question": { - "en": "How many designs are available?" + "en": "How many designs are available?", + "de": "Wieviele Motive sind verfügbar?" }, "freeform": { "key": "coin:design_count", "type": "pnat", "placeholder": { - "en": "Number of designs (e.g. 5)" + "en": "Number of designs (e.g. 5)", + "de": "Motivanzahl (z.B. 5)" } }, "render": { - "en": "This penny press has {coin:design_count} designs available." + "en": "This penny press has {coin:design_count} designs available.", + "de": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl." }, "mappings": [ { "if": "coin:design_count=1", "then": { - "en": "This penny press has one design available." + "en": "This penny press has one design available.", + "de": "Die Münzpresse hat ein Motiv zur Auswahl." } }, { "if": "coin:design_count=2", "then": { - "en": "This penny press has two designs available." + "en": "This penny press has two designs available.", + "de": "Die Münzpresse hat zwei Motive zur Auswahl." } }, { "if": "coin:design_count=3", "then": { - "en": "This penny press has three designs available." + "en": "This penny press has three designs available.", + "de": "Die Münzpresse hat drei Motive zur Auswahl." } }, { "if": "coin:design_count=4", "then": { - "en": "This penny press has four designs available." + "en": "This penny press has four designs available.", + "de": "Die Münzpresse hat vier Motive zur Auswahl." } } ] @@ -77,102 +89,118 @@ { "id": "coin", "question": { - "en": "What coin is used for pressing?" + "en": "What coin is used for pressing?", + "de": "Welche Münze wird zum Pressen verwendet?" }, "freeform": { "key": "coin:type", "type": "string", "placeholder": { - "en": "Coin type (e.g. 10cent)" + "en": "Coin type (e.g. 10cent)", + "de": "Münzenart (z.B. 10 Cent)" } }, "mappings": [ { "if": "coin:type=2cent", "then": { - "en": "This penny press uses a 2 cent coin for pressing." + "en": "This penny press uses a 2 cent coin for pressing.", + "de": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen." } }, { "if": "coin:type=5cent", "then": { - "en": "This penny press uses a 5 cent coin for pressing." + "en": "This penny press uses a 5 cent coin for pressing.", + "de": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen." } }, { "if": "coin:type=10cent", "then": { - "en": "This penny press uses a 10 cent coin for pressing." + "en": "This penny press uses a 10 cent coin for pressing.", + "de": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen." } }, { "if": "coin:type=25cent", "then": { - "en": "This penny press uses a 25 cent coin for pressing." + "en": "This penny press uses a 25 cent coin for pressing.", + "de": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen." }, "hideInAnswer": "_currency!~.*USD.*" }, { "if": "coin:type=50cent", "then": { - "en": "This penny press uses a 50 cent coin for pressing." + "en": "This penny press uses a 50 cent coin for pressing.", + "de": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen." }, "hideInAnswer": "_currency!~.*USD.*" } ], "render": { - "en": "This penny press uses a {coin:type} coin for pressing." + "en": "This penny press uses a {coin:type} coin for pressing.", + "de": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen." } }, "website", { "id": "charge", "question": { - "en": "How much does it cost to press a penny?" + "en": "How much does it cost to press a penny?", + "de": "Wieviel kostet es eine Münze zu Pressen?" }, "freeform": { "key": "charge", "placeholder": { - "en": "Cost (e.g. 0.50 EUR)" + "en": "Cost (e.g. 0.50 EUR)", + "de": "Einwurf (z.B. 0,5€)" } }, "mappings": [ { "if": "charge=1 EUR", "then": { - "en": "It costs 1 euro to press a penny." + "en": "It costs 1 euro to press a penny.", + "de": "Eine Münze zu Pressen kostet 1 Euro." }, "hideInAnswer": "_currency!~.*EUR.*" }, { "if": "charge=2 EUR", "then": { - "en": "It costs 2 euros to press a penny." + "en": "It costs 2 euros to press a penny.", + "de": "Eine Münze zu Pressen kostet 2€." }, "hideInAnswer": "_currency!~.*EUR.*" } ], "render": { - "en": "It costs {charge} to press a penny." + "en": "It costs {charge} to press a penny.", + "de": "Es kostet {charge}€ um eine Münze zu Pressen." } }, "denominations-coins", { "id": "indoor", "question": { - "en": "Is the penny press indoors?" + "en": "Is the penny press indoors?", + "de": "Befindet sich die Münzpresse im Inneren?" }, "mappings": [ { "if": "indoor=yes", "then": { - "en": "This penny press is located indoors." + "en": "This penny press is located indoors.", + "de": "Die Münzpresse befindet sich im Inneren." } }, { "if": "indoor=no", "then": { - "en": "This penny press is located outdoors." + "en": "This penny press is located outdoors.", + "de": "Die Münzpresse befindet sich Draußen." } } ] @@ -197,7 +225,8 @@ "presets": [ { "title": { - "en": "a penny press" + "en": "a penny press", + "de": "Eine Münzpresse" }, "tags": [ "amenity=vending_machine", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 56555e871..deda66b65 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,19 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +26,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +39,51 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}" } }, { @@ -74,19 +92,27 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +133,12 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}" }, "freeform": { "key": "editor" @@ -452,7 +480,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +498,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +516,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +535,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +554,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +572,9 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +590,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +603,9 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +620,8 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier" } }, { diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json index 3558fb555..e014a3be6 100644 --- a/assets/themes/postboxes/postboxes.json +++ b/assets/themes/postboxes/postboxes.json @@ -29,11 +29,11 @@ "cs": "Mapa s poštovními schránkami a poštami" }, "description": { - "en": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ", + "en": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account.", "it": "In questa cartina puoi veder e modificare gli uffici postali e le buche delle lettere. Puoi usare questa cartina per trovare dove imbucare la tua prossima cartolina! :)
Hai trovato un errore o una buca delle lettere mancante? Puoi modificare questa cartina con un account gratuito su OpenStreetMap. ", "zh_Hant": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)
發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 ", "hu": "Ezen a térképen postahivatalok és postaládák adatait találod és egészítheted ki. Utánanézhetsz, hogy hol adhatod fel a következő képeslapodat! :)
Hibát találtál, vagy hiányzik egy postaláda? Ezt a térképet mindössze egy ingyenes OpenStreetMap-fiókkal szerkesztheted. ", - "de": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)
Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten. ", + "de": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)
Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten.", "es": "En este mapa puedes encontrar y añadir datos de oficinas de correo y buzones de correo. ¡Puedes utilizar este mapa para encontrar donde puedes enviar tu próxima postal! :)
¿Has encontrado un error o algo que falta? Puedes editar este mapa con una cuenta de OpenStreetMap gratuita. ", "nl": "Op deze kaart kan je informatie over brievenbussen en postkantoren vinden en toevoegen. Je kan deze kaart gebruiken om te achterhalen waar je je volgende postkaart naar kan sturen! :)
Zie je een fout of ontbreekt een brievenbus? Dan kan je deze kaart aanpassen met een gratis OpenStreetMap account. ", "fr": "Trouvez et ajoutez des bureaux de poste et boîtes à lettres sur cette carte. Utilisez cette carte où vous pouvez envoyer vos cartes postales ! :)
Vous avez trouvez une erreur ou une boîte à lettres est manquante ? Vous pouvez modifier cette carte avec un compte OpenStreetMap gratuit. ", diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json index e56f2b26e..7fadc1933 100644 --- a/assets/themes/vending_machine/vending_machine.json +++ b/assets/themes/vending_machine/vending_machine.json @@ -2,11 +2,13 @@ "id": "vending_machine", "title": { "en": "Vending Machines", - "nl": "Verkoopautomaten" + "nl": "Verkoopautomaten", + "de": "Verkaufsautomaten" }, "description": { "en": "Find vending machines for everything", - "nl": "Vind verkoopautomaten voor alles" + "nl": "Vind verkoopautomaten voor alles", + "de": "Finde Verkaufautomaten für Alles" }, "icon": "./assets/layers/vending_machine/vending_machine.svg", "startLat": 53.21102, diff --git a/langs/en.json b/langs/en.json index f1f82f36b..62a481843 100644 --- a/langs/en.json +++ b/langs/en.json @@ -14,7 +14,7 @@ "available": "This community speaks {native}", "intro": "Get in touch with other people to get to know them, learn from them, …", "notAvailable": "This community does not speak {native}", - "title": "Get in touch with others", + "title": "Get in touch with others" }, "delete": { "cancel": "Cancel", diff --git a/langs/layers/de.json b/langs/layers/de.json index 8f3004998..4d9dab138 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -35,16 +35,6 @@ "1": { "title": "eine freistehende Posterbox" }, - "10": { - "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", - "title": "ein Schild" - }, - "11": { - "title": "eine Skulptur" - }, - "12": { - "title": "eine Wandmalerei" - }, "2": { "title": "eine wandmontierte Posterbox" }, @@ -71,6 +61,16 @@ }, "9": { "title": "ein Totem" + }, + "10": { + "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", + "title": "ein Schild" + }, + "11": { + "title": "eine Skulptur" + }, + "12": { + "title": "eine Wandmalerei" } }, "tagRenderings": { @@ -165,9 +165,6 @@ "1": { "then": "Dies ist ein Brett" }, - "10": { - "then": "Dies ist eine Wandmalerei" - }, "2": { "then": "Dies ist eine Litfaßsäule" }, @@ -191,6 +188,9 @@ }, "9": { "then": "Dies ist ein Totem" + }, + "10": { + "then": "Dies ist eine Wandmalerei" } }, "question": "Welche Art von Werbung ist das?", @@ -205,9 +205,6 @@ "1": { "then": "Brett" }, - "10": { - "then": "Wandmalerei" - }, "2": { "then": "Posterbox" }, @@ -231,6 +228,9 @@ }, "9": { "then": "Totem" + }, + "10": { + "then": "Wandmalerei" } } } @@ -312,15 +312,6 @@ "1": { "then": "Wandbild" }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" - }, "2": { "then": "Malerei" }, @@ -344,6 +335,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1830,27 +1830,6 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" - }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1874,6 +1853,27 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" + }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1929,6 +1929,30 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" + }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1959,9 +1983,6 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -1992,32 +2013,11 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3555,15 +3555,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3587,6 +3578,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3635,15 +3635,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3667,6 +3658,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4606,6 +4606,30 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." + }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4636,9 +4660,6 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4653,27 +4674,6 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4780,21 +4780,6 @@ "1": { "then": "Dies ist eine Pommesbude" }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" - }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4818,6 +4803,21 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" + }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Was für Essen gibt es hier?", @@ -6036,19 +6036,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } - }, "2": { "options": { "0": { @@ -6104,6 +6091,19 @@ "question": "Nur offene Notizen anzeigen" } } + }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } } }, "name": "OpenStreetMap-Hinweise", @@ -6432,21 +6432,6 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." - }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6470,6 +6455,21 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." + }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -7443,6 +7443,30 @@ "1": { "question": "Recycling von Batterien" }, + "2": { + "question": "Recycling von Getränkekartons" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" + }, "10": { "question": "Recycling von Glas" }, @@ -7473,35 +7497,11 @@ "19": { "question": "Recycling von Restabfällen" }, - "2": { - "question": "Recycling von Getränkekartons" - }, "20": { "question": "Recycling von Druckerpatronen" }, "21": { "question": "Recycling von Fahrrädern" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" } } }, @@ -7569,6 +7569,30 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" + }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -7599,9 +7623,6 @@ "19": { "then": "Schuhe können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -7616,27 +7637,6 @@ }, "24": { "then": "Fahrräder können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -8308,12 +8308,6 @@ }, "question": "Hat die Treppe einen Handlauf?" }, - "multilevels": { - "override": { - "question": "Zwischen welchen Stockwerken befindet sich diese Treppe?", - "render": "Diese Treppe ist zwischen den Stockwerken {level}" - } - }, "ramp": { "mappings": { "0": { @@ -8440,12 +8434,6 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" - }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -8469,6 +8457,12 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" + }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -8727,18 +8721,6 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" - }, - "1": { - "then": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart" - } - } - } - }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8952,11 +8934,6 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { - "opening_hours": { - "override": { - "question": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?" - } - }, "toilet-access": { "mappings": { "0": { @@ -9550,27 +9527,6 @@ "1": { "question": "Verkauf von Getränken" }, - "10": { - "question": "Verkauf von Milch" - }, - "11": { - "question": "Verkauf von Brot" - }, - "12": { - "question": "Verkauf von Eiern" - }, - "13": { - "question": "Verkauf von Käse" - }, - "14": { - "question": "Verkauf von Honig" - }, - "15": { - "question": "Verkauf von Kartoffeln" - }, - "16": { - "question": "Verkauf von Blumen" - }, "2": { "question": "Verkauf von Süßigkeiten" }, @@ -9594,6 +9550,27 @@ }, "9": { "question": "Verkauf von Fahrradschläuchen" + }, + "10": { + "question": "Verkauf von Milch" + }, + "11": { + "question": "Verkauf von Brot" + }, + "12": { + "question": "Verkauf von Eiern" + }, + "13": { + "question": "Verkauf von Käse" + }, + "14": { + "question": "Verkauf von Honig" + }, + "15": { + "question": "Verkauf von Kartoffeln" + }, + "16": { + "question": "Verkauf von Blumen" } } } @@ -9634,24 +9611,6 @@ "1": { "then": "Süßigkeiten werden verkauft" }, - "10": { - "then": "Brot wird verkauft" - }, - "11": { - "then": "Eier werden verkauft" - }, - "12": { - "then": "Käse wird verkauft" - }, - "13": { - "then": "Honig wird verkauft" - }, - "14": { - "then": "Kartoffeln werden verkauft" - }, - "15": { - "then": "Blumen werden verkauft" - }, "2": { "then": "Lebensmittel werden verkauft" }, @@ -9675,6 +9634,24 @@ }, "9": { "then": "Milch wird verkauft" + }, + "10": { + "then": "Brot wird verkauft" + }, + "11": { + "then": "Eier werden verkauft" + }, + "12": { + "then": "Käse wird verkauft" + }, + "13": { + "then": "Honig wird verkauft" + }, + "14": { + "then": "Kartoffeln werden verkauft" + }, + "15": { + "then": "Blumen werden verkauft" } }, "question": "Was wird in diesem Automaten verkauft?", @@ -10011,4 +9988,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index dd5fdb1d6..eda2eeb64 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -9429,6 +9429,13 @@ } } }, + "language_picker": { + "mappings": { + "0": { + "then": "The language was set via an URL-parameter and cannot be set by the user.²" + } + } + }, "mangrove-keys": { "render": "Download the private key for your Mangrove Account

Anyone possessing this file can make reviews with your identity

" }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 1ca74c04d..5f3dae47f 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -33,16 +33,6 @@ "1": { "title": "un panneau à affiches scellé au sol" }, - "10": { - "description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées", - "title": "une enseigne" - }, - "11": { - "title": "une sculpture" - }, - "12": { - "title": "une peinture murale" - }, "2": { "title": "un panneau à affiches monté sur un mur" }, @@ -68,6 +58,16 @@ }, "9": { "title": "un totem" + }, + "10": { + "description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées", + "title": "une enseigne" + }, + "11": { + "title": "une sculpture" + }, + "12": { + "title": "une peinture murale" } }, "tagRenderings": { @@ -159,9 +159,6 @@ "1": { "then": "C'est un petit panneau" }, - "10": { - "then": "C'est une peinture murale" - }, "2": { "then": "C'est une colonne" }, @@ -185,6 +182,9 @@ }, "9": { "then": "C'est un totem" + }, + "10": { + "then": "C'est une peinture murale" } }, "question": "De quel type de dispositif publicitaire s'agit-il ?" @@ -195,9 +195,6 @@ "1": { "then": "Petit panneau" }, - "10": { - "then": "Peinture murale" - }, "3": { "then": "Colonne" }, @@ -218,6 +215,9 @@ }, "9": { "then": "Totem" + }, + "10": { + "then": "Peinture murale" } } } @@ -296,15 +296,6 @@ "1": { "then": "Peinture murale" }, - "10": { - "then": "Azulejo (faïence latine)" - }, - "11": { - "then": "Carrelage" - }, - "12": { - "then": "Sculpture sur bois" - }, "2": { "then": "Peinture" }, @@ -328,6 +319,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (faïence latine)" + }, + "11": { + "then": "Carrelage" + }, + "12": { + "then": "Sculpture sur bois" } }, "question": "Quel est le type de cette œuvre d'art ?", @@ -2363,15 +2363,6 @@ "1": { "then": "Cette piste cyclable est goudronée" }, - "10": { - "then": "Cette piste cyclable est faite en graviers fins" - }, - "11": { - "then": "Cette piste cyclable est en cailloux" - }, - "12": { - "then": "Cette piste cyclable est faite en sol brut" - }, "2": { "then": "Cette piste cyclable est asphaltée" }, @@ -2395,6 +2386,15 @@ }, "9": { "then": "Cette piste cyclable est faite en graviers" + }, + "10": { + "then": "Cette piste cyclable est faite en graviers fins" + }, + "11": { + "then": "Cette piste cyclable est en cailloux" + }, + "12": { + "then": "Cette piste cyclable est faite en sol brut" } }, "question": "De quoi est faite la surface de la piste cyclable ?", @@ -2443,15 +2443,6 @@ "1": { "then": "Cette piste cyclable est pavée" }, - "10": { - "then": "Cette piste cyclable est faite en graviers fins" - }, - "11": { - "then": "Cette piste cyclable est en cailloux" - }, - "12": { - "then": "Cette piste cyclable est faite en sol brut" - }, "2": { "then": "Cette piste cyclable est asphaltée" }, @@ -2475,6 +2466,15 @@ }, "9": { "then": "Cette piste cyclable est faite en graviers" + }, + "10": { + "then": "Cette piste cyclable est faite en graviers fins" + }, + "11": { + "then": "Cette piste cyclable est en cailloux" + }, + "12": { + "then": "Cette piste cyclable est faite en sol brut" } }, "question": "De quel materiel est faite cette rue ?", @@ -3304,21 +3304,6 @@ "1": { "then": "C'est une friterie" }, - "10": { - "then": "Des plats chinois sont servis ici" - }, - "11": { - "then": "Des plats grecs sont servis ici" - }, - "12": { - "then": "Des plats indiens sont servis ici" - }, - "13": { - "then": "Des plats turcs sont servis ici" - }, - "14": { - "then": "Des plats thaïlandais sont servis ici" - }, "2": { "then": "Restaurant Italien" }, @@ -3342,6 +3327,21 @@ }, "9": { "then": "Des plats français sont servis ici" + }, + "10": { + "then": "Des plats chinois sont servis ici" + }, + "11": { + "then": "Des plats grecs sont servis ici" + }, + "12": { + "then": "Des plats indiens sont servis ici" + }, + "13": { + "then": "Des plats turcs sont servis ici" + }, + "14": { + "then": "Des plats thaïlandais sont servis ici" } }, "question": "Quelle type de nourriture est servie ici ?", @@ -4670,6 +4670,30 @@ "1": { "question": "Recyclage de piles et batteries domestiques" }, + "2": { + "question": "Recyclage d'emballage de boissons" + }, + "3": { + "question": "Recyclage de boites de conserve et de canettes" + }, + "4": { + "question": "Recyclage de vêtements" + }, + "5": { + "question": "Recyclage des huiles de friture" + }, + "6": { + "question": "Recyclage des huiles de moteur" + }, + "7": { + "question": "Recyclage des lampes fluorescentes" + }, + "8": { + "question": "Recyclage des déchets verts" + }, + "9": { + "question": "Recyclage des bouteilles en verre et des bocaux" + }, "10": { "question": "Recyclage de tout type de verre" }, @@ -4700,35 +4724,11 @@ "19": { "question": "Recyclage des autres déchets" }, - "2": { - "question": "Recyclage d'emballage de boissons" - }, "20": { "question": "Recyclage des cartouches d'imprimante" }, "21": { "question": "Recyclage des vélos" - }, - "3": { - "question": "Recyclage de boites de conserve et de canettes" - }, - "4": { - "question": "Recyclage de vêtements" - }, - "5": { - "question": "Recyclage des huiles de friture" - }, - "6": { - "question": "Recyclage des huiles de moteur" - }, - "7": { - "question": "Recyclage des lampes fluorescentes" - }, - "8": { - "question": "Recyclage des déchets verts" - }, - "9": { - "question": "Recyclage des bouteilles en verre et des bocaux" } } }, @@ -4791,6 +4791,30 @@ "1": { "then": "Les briques alimentaires en carton peuvent être recyclées ici" }, + "2": { + "then": "Les boites de conserve et canettes peuvent être recyclées ici" + }, + "3": { + "then": "Les vêtements peuvent être recyclés ici" + }, + "4": { + "then": "Les huiles de friture peuvent être recyclées ici" + }, + "5": { + "then": "Les huiles de moteur peuvent être recyclées ici" + }, + "6": { + "then": "Les lampes fluorescentes peuvent être recyclées ici" + }, + "7": { + "then": "Les déchets verts peuvent être recyclés ici" + }, + "8": { + "then": "Les déchets organiques peuvent être recyclés ici" + }, + "9": { + "then": "Les bouteilles en verre et bocaux peuvent être recyclés ici" + }, "10": { "then": "Tout type de verre peut être recyclé ici" }, @@ -4821,9 +4845,6 @@ "19": { "then": "Les chaussures peuvent être recyclées ici" }, - "2": { - "then": "Les boites de conserve et canettes peuvent être recyclées ici" - }, "20": { "then": "Les petits appareils électriques peuvent être recyclés ici" }, @@ -4838,27 +4859,6 @@ }, "24": { "then": "Les vélos peuvent être recyclés ici" - }, - "3": { - "then": "Les vêtements peuvent être recyclés ici" - }, - "4": { - "then": "Les huiles de friture peuvent être recyclées ici" - }, - "5": { - "then": "Les huiles de moteur peuvent être recyclées ici" - }, - "6": { - "then": "Les lampes fluorescentes peuvent être recyclées ici" - }, - "7": { - "then": "Les déchets verts peuvent être recyclés ici" - }, - "8": { - "then": "Les déchets organiques peuvent être recyclés ici" - }, - "9": { - "then": "Les bouteilles en verre et bocaux peuvent être recyclés ici" } }, "question": "Que peut-on recycler ici ?" @@ -6212,4 +6212,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/nl.json b/langs/nl.json index 8851cf4fe..adfb3b0af 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -276,7 +276,7 @@ "answeredMultipleSkippedMultiple": "Je beantwoorde {answered} vragen en sloeg {skipped} vragen over", "answeredMultipleSkippedOne": "Je beantwoorde {answered} vragen en sloeg er één over", "answeredOne": "Je beantwoordde één vraag", - "answeredOneSkippedMultiple": "Je beantwoordde één vraag en sloeg er één over", + "answeredOneSkippedMultiple": "Je beantwoordde één vraag en sloeg er {skipped} over", "answeredOneSkippedOne": "Je beantwoorde één vraag en sloeg een andere vraag over", "done": "Geen verdere vragen! Bedankt!", "reactivate": "Heractiveer vragen die je oversloeg", diff --git a/langs/themes/de.json b/langs/themes/de.json index 520448bfd..40aff3f38 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1066,33 +1066,6 @@ "onwheels": { "description": "Auf dieser Karte können Sie öffentlich zugängliche Orte für Rollstuhlfahrer ansehen, bearbeiten oder hinzufügen", "layers": { - "19": { - "override": { - "=title": { - "render": "Statistik" - } - } - }, - "20": { - "override": { - "+tagRenderings": { - "0": { - "render": { - "special": { - "text": "Import" - } - } - }, - "1": { - "render": { - "special": { - "message": "Alle vorgeschlagenen Tags hinzufügen" - } - } - } - } - } - }, "4": { "override": { "filter": { @@ -1135,6 +1108,33 @@ "override": { "name": "Barrierefreie Parkplätze" } + }, + "19": { + "override": { + "=title": { + "render": "Statistik" + } + } + }, + "20": { + "override": { + "+tagRenderings": { + "0": { + "render": { + "special": { + "text": "Import" + } + } + }, + "1": { + "render": { + "special": { + "message": "Alle vorgeschlagenen Tags hinzufügen" + } + } + } + } + } } }, "title": "Auf Rädern" @@ -1295,6 +1295,10 @@ "stations": { "description": "Bahnhofsdetails ansehen, bearbeiten und hinzufügen", "layers": { + "3": { + "description": "Ebene mit Bahnhöfen", + "name": "Bahnhöfe" + }, "16": { "description": "Anzeigen der Züge, die von diesem Bahnhof abfahren", "name": "Abfahrtstafeln", @@ -1326,10 +1330,6 @@ "title": { "render": "Abfahrtstafel" } - }, - "3": { - "description": "Ebene mit Bahnhöfen", - "name": "Bahnhöfe" } }, "title": "Bahnhöfe" @@ -1425,4 +1425,4 @@ "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index 0e13b11b7..e1198eaee 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1066,33 +1066,6 @@ "onwheels": { "description": "On this map, publicly weelchair accessible places are shown and can be easily added", "layers": { - "19": { - "override": { - "=title": { - "render": "Statistics" - } - } - }, - "20": { - "override": { - "+tagRenderings": { - "0": { - "render": { - "special": { - "text": "Import" - } - } - }, - "1": { - "render": { - "special": { - "message": "Add all the suggested tags" - } - } - } - } - } - }, "4": { "override": { "filter": { @@ -1135,6 +1108,33 @@ "override": { "name": "Disabled parking spaces" } + }, + "19": { + "override": { + "=title": { + "render": "Statistics" + } + } + }, + "20": { + "override": { + "+tagRenderings": { + "0": { + "render": { + "special": { + "text": "Import" + } + } + }, + "1": { + "render": { + "special": { + "message": "Add all the suggested tags" + } + } + } + } + } } }, "title": "OnWheels" @@ -1295,6 +1295,10 @@ "stations": { "description": "View, edit and add details to a train station", "layers": { + "3": { + "description": "Layer showing train stations", + "name": "Train Stations" + }, "16": { "description": "Displays showing the trains that will leave from this station", "name": "Departures boards", @@ -1326,10 +1330,6 @@ "title": { "render": "Departures board" } - }, - "3": { - "description": "Layer showing train stations", - "name": "Train Stations" } }, "title": "Train Stations" @@ -1425,4 +1425,4 @@ "shortDescription": "A map with waste baskets", "title": "Waste Basket" } -} +} \ No newline at end of file From 6635204546b96047f44e75556dc88e8e80261cb9 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 9 Jul 2023 12:54:20 +0200 Subject: [PATCH 020/134] Meta: add 'reuse'-license information --- .reuse/dep5 | 13 + LICENSE | 674 ---------------------------------- LICENSES/CC0-1.0.txt | 121 ++++++ LICENSES/GPL-3.0-or-later.txt | 232 ++++++++++++ 4 files changed, 366 insertions(+), 674 deletions(-) create mode 100644 .reuse/dep5 delete mode 100644 LICENSE create mode 100644 LICENSES/CC0-1.0.txt create mode 100644 LICENSES/GPL-3.0-or-later.txt diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 000000000..da6cf7a22 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,13 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: MapComplete +Upstream-Contact: Pieter Vander Vennet +Source: https://github.com/pietervdvn/MapComplete + +Files: scripts/* UI/* Utils/* Customizations/* *.html Docs/* assets/*/*/*.json langs/* test/* Models/* Logic/* +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 +Copyright: MapComplete contributors +Comment: Miscellaneous config files, no real 'creative work' but still a pain to get right +License: CC0-1.0 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - 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), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 000000000..0e259d42c --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt new file mode 100644 index 000000000..f6cdd22a6 --- /dev/null +++ b/LICENSES/GPL-3.0-or-later.txt @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +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), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . + +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . From 56ba8736e6c898e4ac2241bde18ee22537a9bd2e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 02:10:19 +0200 Subject: [PATCH 021/134] CI: add reuse compliance check --- .github/workflows/reuse-compliance-check.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/reuse-compliance-check.yml diff --git a/.github/workflows/reuse-compliance-check.yml b/.github/workflows/reuse-compliance-check.yml new file mode 100644 index 000000000..dd9c31b80 --- /dev/null +++ b/.github/workflows/reuse-compliance-check.yml @@ -0,0 +1,11 @@ +name: REUSE Compliance Check + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v2 From 44707c040e063dedffbf93126f513155cce42a0b Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 02:12:09 +0200 Subject: [PATCH 022/134] Scripts: add reuse lint to package.json actions --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 634428003..c083a1aff 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "weblate-merge": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations", "weblate-fix-heavy": "git fetch weblate-hosted-layers; git fetch weblate-hosted-core; git merge weblate-hosted-layers/master weblate-hosted-core/master ", "housekeeping": "git pull && npx update-browserslist-db@latest && npm run weblate-fix-heavy && npm run generate && npm run generate:docs && npm run generate:contributor-list && vite-node scripts/fetchLanguages.ts && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'chore: automated housekeeping...'" + "reuse-compliance": "reuse lint" }, "keywords": [ "OpenStreetMap", From d3aa5562a58b52362800c15bd993d29ac2ae7fc5 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 02:51:59 +0200 Subject: [PATCH 023/134] Unify some license expressions --- assets/layers/address/license_info.json | 2 +- assets/layers/artwork/license_info.json | 2 +- assets/layers/atm/license_info.json | 2 +- assets/layers/bank/license_info.json | 2 +- assets/layers/barrier/license_info.json | 2 +- assets/layers/bench/license_info.json | 4 +- .../layers/bicycle_library/license_info.json | 2 +- .../layers/bicycle_rental/license_info.json | 2 +- .../license_info.json | 4 +- assets/layers/bike_cafe/license_info.json | 2 +- assets/layers/bike_cleaning/license_info.json | 4 +- assets/layers/bike_parking/license_info.json | 16 +- .../bike_repair_station/license_info.json | 24 +- assets/layers/bike_shop/license_info.json | 8 +- .../bike_themed_object/license_info.json | 2 +- assets/layers/binocular/license_info.json | 2 +- assets/layers/birdhide/license_info.json | 4 +- assets/layers/cafe_pub/license_info.json | 6 +- assets/layers/car_rental/license_info.json | 2 +- .../layers/charging_station/license_info.json | 24 +- assets/layers/clock/license_info.json | 4 +- assets/layers/crab_address/license_info.json | 2 +- assets/layers/crossings/license_info.json | 12 +- .../traffic_sign/be/license_info.json | 18 +- .../traffic_sign/nl/license_info.json | 6 +- assets/layers/defibrillator/license_info.json | 2 +- assets/layers/dentist/license_info.json | 2 +- assets/layers/doctors/license_info.json | 2 +- assets/layers/dogpark/license_info.json | 2 +- .../layers/drinking_water/license_info.json | 2 +- assets/layers/elevator/license_info.json | 2 +- assets/layers/entrance/license_info.json | 4 +- assets/layers/etymology/license_info.json | 2 +- .../layers/fitness_centre/license_info.json | 2 +- .../layers/fitness_station/license_info.json | 52 +-- assets/layers/food/license_info.json | 8 +- assets/layers/ghost_bike/license_info.json | 2 +- assets/layers/governments/license_info.json | 2 +- assets/layers/hospital/license_info.json | 2 +- assets/layers/hotel/license_info.json | 2 +- assets/layers/hydrant/license_info.json | 4 +- assets/layers/icons/license_info.json | 2 +- assets/layers/id_presets/license_info.json | 230 ++++++------- .../information_board/license_info.json | 2 +- assets/layers/kerbs/license_info.json | 10 +- .../kindergarten_childcare/license_info.json | 4 +- assets/layers/map/license_info.json | 8 +- assets/layers/maxspeed/license_info.json | 2 +- assets/layers/memorial/license_info.json | 2 +- .../layers/nature_reserve/license_info.json | 8 +- .../observation_tower/license_info.json | 2 +- .../osm_community_index/license_info.json | 2 +- .../layers/parcel_lockers/license_info.json | 2 +- assets/layers/parking/license_info.json | 2 +- .../layers/parking_spaces/license_info.json | 2 +- .../parking_ticket_machine/license_info.json | 2 +- assets/layers/pharmacy/license_info.json | 2 +- .../layers/physiotherapist/license_info.json | 2 +- assets/layers/picnic_table/license_info.json | 2 +- assets/layers/postboxes/license_info.json | 2 +- assets/layers/postoffices/license_info.json | 2 +- assets/layers/questions/license_info.json | 58 ++-- .../layers/reception_desk/license_info.json | 2 +- assets/layers/recycling/license_info.json | 46 +-- assets/layers/school/license_info.json | 4 +- assets/layers/shops/license_info.json | 2 +- assets/layers/shower/license_info.json | 2 +- assets/layers/slow_roads/license_info.json | 4 +- assets/layers/speed_camera/license_info.json | 2 +- assets/layers/speed_display/license_info.json | 2 +- assets/layers/sport_pitch/license_info.json | 24 +- assets/layers/sports_centre/license_info.json | 2 +- assets/layers/stairs/license_info.json | 2 +- assets/layers/street_lamps/license_info.json | 8 +- assets/layers/toilet/license_info.json | 6 +- assets/layers/trail/license_info.json | 6 +- assets/layers/transit_stops/license_info.json | 2 +- assets/layers/tree_node/license_info.json | 10 +- assets/layers/usersettings/license_info.json | 4 +- .../layers/vending_machine/license_info.json | 16 +- assets/layers/viewpoint/license_info.json | 2 +- .../license_info.json | 2 +- .../walls_and_buildings/license_info.json | 2 +- .../layers/waste_disposal/license_info.json | 2 +- assets/svg/license_info.json | 312 +++++++++--------- assets/themes/advertising/license_info.json | 94 +++--- assets/themes/aed/license_info.json | 2 +- assets/themes/artwork/license_info.json | 2 +- assets/themes/atm/license_info.json | 2 +- assets/themes/bag/license_info.json | 2 +- assets/themes/benches/license_info.json | 4 +- .../themes/bicycle_rental/license_info.json | 4 +- assets/themes/bicyclelib/license_info.json | 2 +- assets/themes/blind_osm/license_info.json | 2 +- assets/themes/bookcases/license_info.json | 2 +- assets/themes/buurtnatuur/license_info.json | 16 +- assets/themes/campersite/license_info.json | 8 +- .../charging_stations/license_info.json | 8 +- assets/themes/climbing/license_info.json | 18 +- .../themes/cycle_highways/license_info.json | 2 +- assets/themes/cycle_infra/license_info.json | 24 +- assets/themes/cyclestreets/license_info.json | 22 +- assets/themes/cyclofix/license_info.json | 8 +- .../themes/drinking_water/license_info.json | 2 +- .../themes/elongated_coin/license_info.json | 2 +- assets/themes/facadegardens/license_info.json | 20 +- assets/themes/fritures/license_info.json | 4 +- assets/themes/fruit_trees/license_info.json | 2 +- assets/themes/ghostbikes/license_info.json | 2 +- assets/themes/grb/license_info.json | 6 +- assets/themes/hackerspaces/license_info.json | 4 +- assets/themes/hailhydrant/license_info.json | 18 +- assets/themes/maps/license_info.json | 2 +- assets/themes/maxspeed/license_info.json | 30 +- assets/themes/nature/license_info.json | 2 +- assets/themes/notes/license_info.json | 2 +- assets/themes/onwheels/license_info.json | 32 +- .../themes/openwindpowermap/license_info.json | 4 +- .../osm_community_index/license_info.json | 2 +- assets/themes/parkings/license_info.json | 2 +- assets/themes/pets/license_info.json | 4 +- assets/themes/playgrounds/license_info.json | 2 +- assets/themes/postal_codes/license_info.json | 2 +- .../rainbow_crossings/license_info.json | 4 +- assets/themes/shops/license_info.json | 2 +- assets/themes/speelplekken/license_info.json | 16 +- assets/themes/sports/license_info.json | 2 +- assets/themes/stations/license_info.json | 14 +- assets/themes/surveillance/license_info.json | 8 +- .../NEGATIEF/license_info.json | 26 +- .../toerisme_vlaanderen/license_info.json | 48 +-- assets/themes/toilets/license_info.json | 2 +- assets/themes/trees/license_info.json | 2 +- assets/themes/uk_addresses/license_info.json | 12 +- assets/themes/waste_basket/license_info.json | 2 +- assets/themes/width/license_info.json | 2 +- 136 files changed, 784 insertions(+), 784 deletions(-) diff --git a/assets/layers/address/license_info.json b/assets/layers/address/license_info.json index 8ea1617ec..48a4000d4 100644 --- a/assets/layers/address/license_info.json +++ b/assets/layers/address/license_info.json @@ -1,7 +1,7 @@ [ { "path": "housenumber_blank.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/artwork/license_info.json b/assets/layers/artwork/license_info.json index 1de90de4e..358b8daf9 100644 --- a/assets/layers/artwork/license_info.json +++ b/assets/layers/artwork/license_info.json @@ -1,7 +1,7 @@ [ { "path": "artwork.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Statue-14.svg" diff --git a/assets/layers/atm/license_info.json b/assets/layers/atm/license_info.json index 91ffee8e6..a3d694ce9 100644 --- a/assets/layers/atm/license_info.json +++ b/assets/layers/atm/license_info.json @@ -1,7 +1,7 @@ [ { "path": "atm.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Michael Glanznig", "Andy Allan" diff --git a/assets/layers/bank/license_info.json b/assets/layers/bank/license_info.json index e2c96540f..b3c8e8796 100644 --- a/assets/layers/bank/license_info.json +++ b/assets/layers/bank/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bank.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "nebulon42" ], diff --git a/assets/layers/barrier/license_info.json b/assets/layers/barrier/license_info.json index 650800a12..a63bd0efc 100644 --- a/assets/layers/barrier/license_info.json +++ b/assets/layers/barrier/license_info.json @@ -1,7 +1,7 @@ [ { "path": "barrier.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], diff --git a/assets/layers/bench/license_info.json b/assets/layers/bench/license_info.json index 63bb2ba0f..c72cb69f8 100644 --- a/assets/layers/bench/license_info.json +++ b/assets/layers/bench/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bench.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Tobias Zwick" ], @@ -11,7 +11,7 @@ }, { "path": "two_sided.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/bicycle_library/license_info.json b/assets/layers/bicycle_library/license_info.json index 77ca71b66..62a56bc15 100644 --- a/assets/layers/bicycle_library/license_info.json +++ b/assets/layers/bicycle_library/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bicycle_library.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/bicycle_rental/license_info.json b/assets/layers/bicycle_rental/license_info.json index 099643225..bf70fbb21 100644 --- a/assets/layers/bicycle_rental/license_info.json +++ b/assets/layers/bicycle_rental/license_info.json @@ -1,7 +1,7 @@ [ { "path": "rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], diff --git a/assets/layers/bicycle_tube_vending_machine/license_info.json b/assets/layers/bicycle_tube_vending_machine/license_info.json index 530bbd28f..3a4480d87 100644 --- a/assets/layers/bicycle_tube_vending_machine/license_info.json +++ b/assets/layers/bicycle_tube_vending_machine/license_info.json @@ -1,7 +1,7 @@ [ { "path": "pinIcon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "tube.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/bike_cafe/license_info.json b/assets/layers/bike_cafe/license_info.json index 85edb1ef3..b63ff50e3 100644 --- a/assets/layers/bike_cafe/license_info.json +++ b/assets/layers/bike_cafe/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bike_cafe.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/layers/bike_cleaning/license_info.json b/assets/layers/bike_cleaning/license_info.json index 735c6d583..81c0ffa1b 100644 --- a/assets/layers/bike_cleaning/license_info.json +++ b/assets/layers/bike_cleaning/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bike_cleaning.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "bike_cleaning_icon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/bike_parking/license_info.json b/assets/layers/bike_parking/license_info.json index 3aa771659..e1db0758e 100644 --- a/assets/layers/bike_parking/license_info.json +++ b/assets/layers/bike_parking/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bollard.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -11,7 +11,7 @@ }, { "path": "handlebar_holder.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -21,7 +21,7 @@ }, { "path": "parking.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -35,7 +35,7 @@ }, { "path": "rack.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -45,7 +45,7 @@ }, { "path": "shed.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -55,7 +55,7 @@ }, { "path": "staple.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -65,7 +65,7 @@ }, { "path": "two_tier.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], @@ -75,7 +75,7 @@ }, { "path": "wall_loops.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Vande Graveele" ], diff --git a/assets/layers/bike_repair_station/license_info.json b/assets/layers/bike_repair_station/license_info.json index fb56c0978..16db5b2bc 100644 --- a/assets/layers/bike_repair_station/license_info.json +++ b/assets/layers/bike_repair_station/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bike_pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -15,7 +15,7 @@ }, { "path": "broken_pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -29,7 +29,7 @@ }, { "path": "pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -43,7 +43,7 @@ }, { "path": "pump_example.png", - "license": "Used with permission; all rights reserved", + "license": "USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED", "authors": [ "Turvec Solutions" ], @@ -53,7 +53,7 @@ }, { "path": "pump_example_manual.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -61,7 +61,7 @@ }, { "path": "pump_example_round.jpg", - "license": "Used with permission; all rights reserved", + "license": "USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED", "authors": [ "©Altinnova" ], @@ -72,7 +72,7 @@ }, { "path": "repair_station.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -86,7 +86,7 @@ }, { "path": "repair_station_broken_pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -100,7 +100,7 @@ }, { "path": "repair_station_example.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Polarbear24" ], @@ -110,7 +110,7 @@ }, { "path": "repair_station_example_2.jpg", - "license": "CC-BY-SA 4.0 International", + "license": "CC-BY-SA-4.0", "authors": [ "MOs810" ], @@ -120,7 +120,7 @@ }, { "path": "repair_station_example_3.jpg", - "license": "CC-BY-SA 3.0 Unported", + "license": "CC-BY-SA-3.0-UNPORTED", "authors": [ "Thelmadatter" ], @@ -130,7 +130,7 @@ }, { "path": "repair_station_pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/layers/bike_shop/license_info.json b/assets/layers/bike_shop/license_info.json index 61474f1d1..2d6b35370 100644 --- a/assets/layers/bike_shop/license_info.json +++ b/assets/layers/bike_shop/license_info.json @@ -1,7 +1,7 @@ [ { "path": "pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -15,7 +15,7 @@ }, { "path": "repair_shop.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -29,7 +29,7 @@ }, { "path": "shop.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", @@ -43,7 +43,7 @@ }, { "path": "tools.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/layers/bike_themed_object/license_info.json b/assets/layers/bike_themed_object/license_info.json index de3ae46f9..726439135 100644 --- a/assets/layers/bike_themed_object/license_info.json +++ b/assets/layers/bike_themed_object/license_info.json @@ -1,7 +1,7 @@ [ { "path": "other_services.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/binocular/license_info.json b/assets/layers/binocular/license_info.json index 287232ae8..af31a3995 100644 --- a/assets/layers/binocular/license_info.json +++ b/assets/layers/binocular/license_info.json @@ -1,7 +1,7 @@ [ { "path": "binoculars_example.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Moheen Reeyad" ], diff --git a/assets/layers/birdhide/license_info.json b/assets/layers/birdhide/license_info.json index ed2db1b5d..ab139a9c2 100644 --- a/assets/layers/birdhide/license_info.json +++ b/assets/layers/birdhide/license_info.json @@ -1,7 +1,7 @@ [ { "path": "birdhide.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -11,7 +11,7 @@ }, { "path": "birdshelter.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Font Awesome Free 5.2.0 by @fontawesome" ], diff --git a/assets/layers/cafe_pub/license_info.json b/assets/layers/cafe_pub/license_info.json index 9ba0c8457..321990ac0 100644 --- a/assets/layers/cafe_pub/license_info.json +++ b/assets/layers/cafe_pub/license_info.json @@ -1,7 +1,7 @@ [ { "path": "cafe.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], @@ -11,7 +11,7 @@ }, { "path": "nightclub.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Osm Carto" ], @@ -21,7 +21,7 @@ }, { "path": "pub.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], diff --git a/assets/layers/car_rental/license_info.json b/assets/layers/car_rental/license_info.json index 31c8cda5e..2e1e984fd 100644 --- a/assets/layers/car_rental/license_info.json +++ b/assets/layers/car_rental/license_info.json @@ -1,7 +1,7 @@ [ { "path": "car_rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "American Institute of Graphic Arts" ], diff --git a/assets/layers/charging_station/license_info.json b/assets/layers/charging_station/license_info.json index 6d8d79702..d0d4e9ba2 100644 --- a/assets/layers/charging_station/license_info.json +++ b/assets/layers/charging_station/license_info.json @@ -12,7 +12,7 @@ }, { "path": "Chademo_type4.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -22,7 +22,7 @@ }, { "path": "Tesla-hpwc-model-s.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -32,7 +32,7 @@ }, { "path": "Type1-ccs.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -42,7 +42,7 @@ }, { "path": "Type1_J1772.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -52,7 +52,7 @@ }, { "path": "Type2_CCS.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -62,7 +62,7 @@ }, { "path": "Type2_socket.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok" ], @@ -72,7 +72,7 @@ }, { "path": "Type2_tethered.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GreatDrok", "Open Charge Map" @@ -83,7 +83,7 @@ }, { "path": "Type3c.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Pyrog" ], @@ -101,7 +101,7 @@ }, { "path": "bosch-3pin.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -109,7 +109,7 @@ }, { "path": "bosch-5pin.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -117,7 +117,7 @@ }, { "path": "under_construction.svg", - "license": "Public domain", + "license": "PUBLIC-DOMAIN", "authors": [ "Sarang" ], @@ -127,7 +127,7 @@ }, { "path": "usb_port.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Ryan Dardis" ], diff --git a/assets/layers/clock/license_info.json b/assets/layers/clock/license_info.json index a919fc110..5bb01125d 100644 --- a/assets/layers/clock/license_info.json +++ b/assets/layers/clock/license_info.json @@ -1,7 +1,7 @@ [ { "path": "clock.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "SJJB Management" ], @@ -11,7 +11,7 @@ }, { "path": "clock_digital.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], diff --git a/assets/layers/crab_address/license_info.json b/assets/layers/crab_address/license_info.json index 8ea1617ec..48a4000d4 100644 --- a/assets/layers/crab_address/license_info.json +++ b/assets/layers/crab_address/license_info.json @@ -1,7 +1,7 @@ [ { "path": "housenumber_blank.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/crossings/license_info.json b/assets/layers/crossings/license_info.json index 088c6de42..22105ed13 100644 --- a/assets/layers/crossings/license_info.json +++ b/assets/layers/crossings/license_info.json @@ -1,7 +1,7 @@ [ { "path": "180px-Trairvoja_mapeto.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Martin Constantino–Bodin" ], @@ -11,7 +11,7 @@ }, { "path": "Belgian_road_sign_B22.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -21,7 +21,7 @@ }, { "path": "Belgian_road_sign_B23.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -31,7 +31,7 @@ }, { "path": "Vibrating_button_illustration.jpg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Tobias Zwick" ], @@ -41,7 +41,7 @@ }, { "path": "pedestrian_crossing.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -51,7 +51,7 @@ }, { "path": "traffic_lights.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json b/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json index 494e4ad57..64e114dae 100644 --- a/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Belgian_road_sign_D07.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -11,7 +11,7 @@ }, { "path": "Belgian_road_sign_D09.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -21,7 +21,7 @@ }, { "path": "Belgian_road_sign_D10.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -31,7 +31,7 @@ }, { "path": "Belgian_traffic_sign_M13.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -41,7 +41,7 @@ }, { "path": "Belgian_traffic_sign_M14.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -51,7 +51,7 @@ }, { "path": "Belgian_traffic_sign_M15.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -61,7 +61,7 @@ }, { "path": "Belgian_traffic_sign_M16.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -71,7 +71,7 @@ }, { "path": "Belgian_traffic_sign_M6.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], @@ -81,7 +81,7 @@ }, { "path": "Belgian_traffic_sign_M7.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json b/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json index 7ec57b591..add43997e 100644 --- a/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json +++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Nederlands_verkeersbord_G11.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Ministerie van Infrastructuur en Waterstaat" ], @@ -11,7 +11,7 @@ }, { "path": "Nederlands_verkeersbord_G12a.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Ministerie van Infrastructuur en Waterstaat" ], @@ -21,7 +21,7 @@ }, { "path": "Nederlands_verkeersbord_G13.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Ministerie van Infrastructuur en Waterstaat" ], diff --git a/assets/layers/defibrillator/license_info.json b/assets/layers/defibrillator/license_info.json index 28426cd49..86945b569 100644 --- a/assets/layers/defibrillator/license_info.json +++ b/assets/layers/defibrillator/license_info.json @@ -1,7 +1,7 @@ [ { "path": "defibrillator.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "MaxxL" ], diff --git a/assets/layers/dentist/license_info.json b/assets/layers/dentist/license_info.json index a7a30a41b..3540ae551 100644 --- a/assets/layers/dentist/license_info.json +++ b/assets/layers/dentist/license_info.json @@ -1,7 +1,7 @@ [ { "path": "dentist.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], diff --git a/assets/layers/doctors/license_info.json b/assets/layers/doctors/license_info.json index 90889fdc6..8df43c328 100644 --- a/assets/layers/doctors/license_info.json +++ b/assets/layers/doctors/license_info.json @@ -1,7 +1,7 @@ [ { "path": "doctors.svg", - "license": "cc0", + "license": "CC0-1.0", "authors": [ "osmcarto" ], diff --git a/assets/layers/dogpark/license_info.json b/assets/layers/dogpark/license_info.json index 1a51abf46..c2f118c3c 100644 --- a/assets/layers/dogpark/license_info.json +++ b/assets/layers/dogpark/license_info.json @@ -1,7 +1,7 @@ [ { "path": "dog-park.svg", - "license": "CC0 1.0", + "license": "CC0-1.0", "authors": [ "Public Domain Symbols", "Niels Elgaard Larsen" diff --git a/assets/layers/drinking_water/license_info.json b/assets/layers/drinking_water/license_info.json index 38b94901d..343f5d945 100644 --- a/assets/layers/drinking_water/license_info.json +++ b/assets/layers/drinking_water/license_info.json @@ -1,7 +1,7 @@ [ { "path": "drips.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/layers/elevator/license_info.json b/assets/layers/elevator/license_info.json index 37b617e4f..09245123b 100644 --- a/assets/layers/elevator/license_info.json +++ b/assets/layers/elevator/license_info.json @@ -1,7 +1,7 @@ [ { "path": "elevator_wheelchair.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "https://www.ctsteward.com/" ], diff --git a/assets/layers/entrance/license_info.json b/assets/layers/entrance/license_info.json index 2beea1223..1df7d3545 100644 --- a/assets/layers/entrance/license_info.json +++ b/assets/layers/entrance/license_info.json @@ -1,7 +1,7 @@ [ { "path": "emergency_door.svg", - "license": "CC-BY-SA 4.0 international", + "license": "CC-BY-SA-4.0", "authors": [ "PanierAvide" ], @@ -11,7 +11,7 @@ }, { "path": "entrance.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], diff --git a/assets/layers/etymology/license_info.json b/assets/layers/etymology/license_info.json index d186e73a2..8f6e1f424 100644 --- a/assets/layers/etymology/license_info.json +++ b/assets/layers/etymology/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/fitness_centre/license_info.json b/assets/layers/fitness_centre/license_info.json index 1499cb600..579e377fb 100644 --- a/assets/layers/fitness_centre/license_info.json +++ b/assets/layers/fitness_centre/license_info.json @@ -1,7 +1,7 @@ [ { "path": "gym.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Bernd Lakenbrink", "Noun Project" diff --git a/assets/layers/fitness_station/license_info.json b/assets/layers/fitness_station/license_info.json index 35d43e95e..89f250c60 100644 --- a/assets/layers/fitness_station/license_info.json +++ b/assets/layers/fitness_station/license_info.json @@ -1,7 +1,7 @@ [ { "path": "07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Kolforn" ], @@ -11,7 +11,7 @@ }, { "path": "Annecy_-_rower.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tiia Monto" ], @@ -21,7 +21,7 @@ }, { "path": "Ansan_Park_beind_the_city_hall_022.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Piotrus" ], @@ -31,7 +31,7 @@ }, { "path": "Battling_ropes.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -41,7 +41,7 @@ }, { "path": "Captains_chair.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -51,7 +51,7 @@ }, { "path": "Exercise9159.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "יעקב" ], @@ -61,7 +61,7 @@ }, { "path": "Exercise9170.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "יעקב" ], @@ -71,7 +71,7 @@ }, { "path": "Exercise_Box.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -81,7 +81,7 @@ }, { "path": "Fitness_station_beam_jump.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -91,7 +91,7 @@ }, { "path": "Fitness_station_hurdling.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -101,7 +101,7 @@ }, { "path": "Fitness_station_leapfrog.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -111,7 +111,7 @@ }, { "path": "Fitness_station_slalom.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -121,7 +121,7 @@ }, { "path": "Fitness_station_stepping_stone.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -131,7 +131,7 @@ }, { "path": "Fitness_station_stretch_bars.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos" ], @@ -141,7 +141,7 @@ }, { "path": "Fitness_station_wall.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Axelos", "Al-Hun" @@ -152,7 +152,7 @@ }, { "path": "Horizontal_ladder.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -162,7 +162,7 @@ }, { "path": "Inclined_sit-up_and_hyperextension_bench.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -172,7 +172,7 @@ }, { "path": "Inclined_sit-up_bench.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -182,7 +182,7 @@ }, { "path": "Log_lifting_exercise.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -192,7 +192,7 @@ }, { "path": "Outdoor_fitness_station_sign.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "kaitu" ], @@ -203,7 +203,7 @@ }, { "path": "Outdoor_stationary_bicycle.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -213,7 +213,7 @@ }, { "path": "Push-up_bars.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tpikonen" ], @@ -223,7 +223,7 @@ }, { "path": "RIAN_archive_493268_Sports_at_a_kindergarten.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Igor Utkin" ], @@ -233,7 +233,7 @@ }, { "path": "Slacklineanlage_im_Dietenbachpark.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Andreas Schwarzkopf" ], @@ -243,7 +243,7 @@ }, { "path": "Trimm-Dich-Pfad_Grünwalder_Forst_Klimmzüge.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Zeitlupe" ], @@ -253,7 +253,7 @@ }, { "path": "fitness.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Kocio" ], diff --git a/assets/layers/food/license_info.json b/assets/layers/food/license_info.json index 0cedfea1a..8006dbff6 100644 --- a/assets/layers/food/license_info.json +++ b/assets/layers/food/license_info.json @@ -11,7 +11,7 @@ }, { "path": "fastfood.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], @@ -21,7 +21,7 @@ }, { "path": "fries.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], @@ -31,7 +31,7 @@ }, { "path": "organic.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "European Commission" ], @@ -41,7 +41,7 @@ }, { "path": "restaurant.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], diff --git a/assets/layers/ghost_bike/license_info.json b/assets/layers/ghost_bike/license_info.json index 0027c0ef9..76e14f174 100644 --- a/assets/layers/ghost_bike/license_info.json +++ b/assets/layers/ghost_bike/license_info.json @@ -1,7 +1,7 @@ [ { "path": "ghost_bike.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/governments/license_info.json b/assets/layers/governments/license_info.json index 3281710ec..ca29eb3d4 100644 --- a/assets/layers/governments/license_info.json +++ b/assets/layers/governments/license_info.json @@ -1,7 +1,7 @@ [ { "path": "government.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], diff --git a/assets/layers/hospital/license_info.json b/assets/layers/hospital/license_info.json index 8a37d59ec..66b23b3eb 100644 --- a/assets/layers/hospital/license_info.json +++ b/assets/layers/hospital/license_info.json @@ -1,7 +1,7 @@ [ { "path": "hospital.svg", - "license": "CC-0", + "license": "CC0-1.0", "authors": [ "osmcarto" ], diff --git a/assets/layers/hotel/license_info.json b/assets/layers/hotel/license_info.json index 8c176f524..322495cd9 100644 --- a/assets/layers/hotel/license_info.json +++ b/assets/layers/hotel/license_info.json @@ -1,7 +1,7 @@ [ { "path": "hotel.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Andy Allan", "Michael Glanznig", diff --git a/assets/layers/hydrant/license_info.json b/assets/layers/hydrant/license_info.json index 7b01ebaa2..a8d61875e 100644 --- a/assets/layers/hydrant/license_info.json +++ b/assets/layers/hydrant/license_info.json @@ -1,7 +1,7 @@ [ { "path": "barcelona.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CLIGNER" ], @@ -11,7 +11,7 @@ }, { "path": "storz.jpg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Karl Gruber" ], diff --git a/assets/layers/icons/license_info.json b/assets/layers/icons/license_info.json index 3a2a20a5e..8dcba766d 100644 --- a/assets/layers/icons/license_info.json +++ b/assets/layers/icons/license_info.json @@ -1,7 +1,7 @@ [ { "path": "website.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/id_presets/license_info.json b/assets/layers/id_presets/license_info.json index a1aacc2ec..7d4e44e56 100644 --- a/assets/layers/id_presets/license_info.json +++ b/assets/layers/id_presets/license_info.json @@ -11,7 +11,7 @@ }, { "path": "fas-baby-carriage.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -21,7 +21,7 @@ }, { "path": "fas-bath.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -31,7 +31,7 @@ }, { "path": "fas-blender.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -41,7 +41,7 @@ }, { "path": "fas-book.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -51,7 +51,7 @@ }, { "path": "fas-camera-retro.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -61,7 +61,7 @@ }, { "path": "fas-cannabis.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -71,7 +71,7 @@ }, { "path": "fas-car-battery.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -81,7 +81,7 @@ }, { "path": "fas-carrot.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -91,7 +91,7 @@ }, { "path": "fas-cat.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -101,7 +101,7 @@ }, { "path": "fas-cheese.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -111,7 +111,7 @@ }, { "path": "fas-compact-disc.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -121,7 +121,7 @@ }, { "path": "fas-couch.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -131,7 +131,7 @@ }, { "path": "fas-crutch.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -141,7 +141,7 @@ }, { "path": "fas-dice.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -151,7 +151,7 @@ }, { "path": "fas-dolly.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -161,7 +161,7 @@ }, { "path": "fas-door-open.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -171,7 +171,7 @@ }, { "path": "fas-dragon.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -181,7 +181,7 @@ }, { "path": "fas-futbol.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -191,7 +191,7 @@ }, { "path": "fas-guitar.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -201,7 +201,7 @@ }, { "path": "fas-hat-cowboy-side.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -211,7 +211,7 @@ }, { "path": "fas-key.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -221,7 +221,7 @@ }, { "path": "fas-laptop.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -231,7 +231,7 @@ }, { "path": "fas-leaf.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -241,7 +241,7 @@ }, { "path": "fas-microchip.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -251,7 +251,7 @@ }, { "path": "fas-motorcycle.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -261,7 +261,7 @@ }, { "path": "fas-newspaper.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -271,7 +271,7 @@ }, { "path": "fas-paint-roller.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -281,7 +281,7 @@ }, { "path": "fas-paperclip.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -291,7 +291,7 @@ }, { "path": "fas-pills.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -301,7 +301,7 @@ }, { "path": "fas-plug.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -311,7 +311,7 @@ }, { "path": "fas-print.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -321,7 +321,7 @@ }, { "path": "fas-rocket.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -331,7 +331,7 @@ }, { "path": "fas-store.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -341,7 +341,7 @@ }, { "path": "fas-suitcase-rolling.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -351,7 +351,7 @@ }, { "path": "fas-suitcase.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -361,7 +361,7 @@ }, { "path": "fas-tape.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -371,7 +371,7 @@ }, { "path": "fas-tractor.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -381,7 +381,7 @@ }, { "path": "fas-trophy.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -391,7 +391,7 @@ }, { "path": "fas-vector-square.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -401,7 +401,7 @@ }, { "path": "fas-wine-bottle.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font-Awesome icon set" ], @@ -411,7 +411,7 @@ }, { "path": "maki-alcohol-shop.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -421,7 +421,7 @@ }, { "path": "maki-bakery.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -431,7 +431,7 @@ }, { "path": "maki-bicycle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -441,7 +441,7 @@ }, { "path": "maki-car-repair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -451,7 +451,7 @@ }, { "path": "maki-car.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -461,7 +461,7 @@ }, { "path": "maki-cemetery.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -471,7 +471,7 @@ }, { "path": "maki-clothing-store.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -481,7 +481,7 @@ }, { "path": "maki-confectionery.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -491,7 +491,7 @@ }, { "path": "maki-florist.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -501,7 +501,7 @@ }, { "path": "maki-gaming.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -511,7 +511,7 @@ }, { "path": "maki-garden-centre.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -521,7 +521,7 @@ }, { "path": "maki-gift.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -531,7 +531,7 @@ }, { "path": "maki-grocery.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -541,7 +541,7 @@ }, { "path": "maki-jewelry-store.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -551,7 +551,7 @@ }, { "path": "maki-lodging.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -561,7 +561,7 @@ }, { "path": "maki-optician.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -571,7 +571,7 @@ }, { "path": "maki-shoe.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -581,7 +581,7 @@ }, { "path": "maki-shop.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -591,7 +591,7 @@ }, { "path": "maki-teahouse.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -601,7 +601,7 @@ }, { "path": "maki-telephone.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -611,7 +611,7 @@ }, { "path": "maki-warehouse.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -621,7 +621,7 @@ }, { "path": "maki-watch.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set" ], @@ -631,7 +631,7 @@ }, { "path": "temaki-balloon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -641,7 +641,7 @@ }, { "path": "temaki-beauty_salon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -651,7 +651,7 @@ }, { "path": "temaki-boat.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -661,7 +661,7 @@ }, { "path": "temaki-bottles.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -671,7 +671,7 @@ }, { "path": "temaki-bow_and_arrow.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -681,7 +681,7 @@ }, { "path": "temaki-camper_trailer.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -691,7 +691,7 @@ }, { "path": "temaki-cleaver.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -701,7 +701,7 @@ }, { "path": "temaki-cloth.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -711,7 +711,7 @@ }, { "path": "temaki-clothes_hanger.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -721,7 +721,7 @@ }, { "path": "temaki-coffee.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -731,7 +731,7 @@ }, { "path": "temaki-compass.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -741,7 +741,7 @@ }, { "path": "temaki-curtains.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -751,7 +751,7 @@ }, { "path": "temaki-dagger.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -761,7 +761,7 @@ }, { "path": "temaki-desk_lamp.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -771,7 +771,7 @@ }, { "path": "temaki-fashion_accessories.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -781,7 +781,7 @@ }, { "path": "temaki-fireplace.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -791,7 +791,7 @@ }, { "path": "temaki-fish_cleaning.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -801,7 +801,7 @@ }, { "path": "temaki-furniture.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -811,7 +811,7 @@ }, { "path": "temaki-hair_care.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -821,7 +821,7 @@ }, { "path": "temaki-hammer_shoe.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -831,7 +831,7 @@ }, { "path": "temaki-handbag.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -841,7 +841,7 @@ }, { "path": "temaki-hearing_aid.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -851,7 +851,7 @@ }, { "path": "temaki-ice_fishing.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -861,7 +861,7 @@ }, { "path": "temaki-kitchen_sink.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -871,7 +871,7 @@ }, { "path": "temaki-laundry.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -881,7 +881,7 @@ }, { "path": "temaki-lipstick.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -891,7 +891,7 @@ }, { "path": "temaki-meat.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -901,7 +901,7 @@ }, { "path": "temaki-military.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -911,7 +911,7 @@ }, { "path": "temaki-money_hand.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -921,7 +921,7 @@ }, { "path": "temaki-motorcycle_repair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -931,7 +931,7 @@ }, { "path": "temaki-movie_rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -941,7 +941,7 @@ }, { "path": "temaki-needle_and_spool.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -951,7 +951,7 @@ }, { "path": "temaki-perfume.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -961,7 +961,7 @@ }, { "path": "temaki-pet_grooming.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -971,7 +971,7 @@ }, { "path": "temaki-pipe.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -981,7 +981,7 @@ }, { "path": "temaki-power.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -991,7 +991,7 @@ }, { "path": "temaki-propane_tank.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1001,7 +1001,7 @@ }, { "path": "temaki-psychic.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1011,7 +1011,7 @@ }, { "path": "temaki-rocket_firework.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1021,7 +1021,7 @@ }, { "path": "temaki-scuba_diving.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1031,7 +1031,7 @@ }, { "path": "temaki-spa.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1041,7 +1041,7 @@ }, { "path": "temaki-speaker.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1051,7 +1051,7 @@ }, { "path": "temaki-spice_bottle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1061,7 +1061,7 @@ }, { "path": "temaki-storage_fermenter.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1071,7 +1071,7 @@ }, { "path": "temaki-storage_rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1081,7 +1081,7 @@ }, { "path": "temaki-tattoo_machine.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1091,7 +1091,7 @@ }, { "path": "temaki-tiling.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1101,7 +1101,7 @@ }, { "path": "temaki-tire.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1111,7 +1111,7 @@ }, { "path": "temaki-tools.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1121,7 +1121,7 @@ }, { "path": "temaki-vacuum.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1131,7 +1131,7 @@ }, { "path": "temaki-vase.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1141,7 +1141,7 @@ }, { "path": "temaki-water_bottle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], @@ -1151,7 +1151,7 @@ }, { "path": "temaki-window.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki icon set" ], diff --git a/assets/layers/information_board/license_info.json b/assets/layers/information_board/license_info.json index e48fb3870..6358380f3 100644 --- a/assets/layers/information_board/license_info.json +++ b/assets/layers/information_board/license_info.json @@ -1,7 +1,7 @@ [ { "path": "board.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Board-14.svg" diff --git a/assets/layers/kerbs/license_info.json b/assets/layers/kerbs/license_info.json index 61687d833..1da8afbf5 100644 --- a/assets/layers/kerbs/license_info.json +++ b/assets/layers/kerbs/license_info.json @@ -1,7 +1,7 @@ [ { "path": "KerbIcon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Treeem" ], @@ -11,7 +11,7 @@ }, { "path": "flush.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jeroen Hoek" ], @@ -21,7 +21,7 @@ }, { "path": "lowered.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jeroen Hoek" ], @@ -31,7 +31,7 @@ }, { "path": "no.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jeroen Hoek" ], @@ -41,7 +41,7 @@ }, { "path": "raised.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jeroen Hoek" ], diff --git a/assets/layers/kindergarten_childcare/license_info.json b/assets/layers/kindergarten_childcare/license_info.json index 81dbf76b5..9da793cbe 100644 --- a/assets/layers/kindergarten_childcare/license_info.json +++ b/assets/layers/kindergarten_childcare/license_info.json @@ -1,7 +1,7 @@ [ { "path": "childcare.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Diego Naive" ], @@ -11,7 +11,7 @@ }, { "path": "kindergarten.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Diego Naive", "VideoPlasty", diff --git a/assets/layers/map/license_info.json b/assets/layers/map/license_info.json index d4d1b1655..d8d21ad25 100644 --- a/assets/layers/map/license_info.json +++ b/assets/layers/map/license_info.json @@ -1,7 +1,7 @@ [ { "path": "map-stickered.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "OpenStreetMap", " Pieter Vander Vennet", @@ -14,7 +14,7 @@ }, { "path": "map.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -22,7 +22,7 @@ }, { "path": "osm-logo-buggy-attr.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -30,7 +30,7 @@ }, { "path": "osm-logo-white-bg.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [], "sources": [ "https://www.OpenStreetMap.org" diff --git a/assets/layers/maxspeed/license_info.json b/assets/layers/maxspeed/license_info.json index b27ffbc1a..2df120d2f 100644 --- a/assets/layers/maxspeed/license_info.json +++ b/assets/layers/maxspeed/license_info.json @@ -1,7 +1,7 @@ [ { "path": "living_street_be.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], diff --git a/assets/layers/memorial/license_info.json b/assets/layers/memorial/license_info.json index 3d4379d1c..a02ef7b01 100644 --- a/assets/layers/memorial/license_info.json +++ b/assets/layers/memorial/license_info.json @@ -1,7 +1,7 @@ [ { "path": "plaque.svg", - "license": "CC-0", + "license": "CC0-1.0", "authors": [ "OSM Carto" ], diff --git a/assets/layers/nature_reserve/license_info.json b/assets/layers/nature_reserve/license_info.json index 488d8da9e..60ea0b1ab 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; ALL-RIGHTS-RESERVED", "authors": [ "Agentschap Natuur en Bos" ], @@ -11,7 +11,7 @@ }, { "path": "Natuurpunt.jpg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Natuurpunt" ], @@ -21,7 +21,7 @@ }, { "path": "groen_logo.svg", - "license": "All rights reserved", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "Groen" ], @@ -31,7 +31,7 @@ }, { "path": "nature_reserve.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@ Эдуард Черных" ], diff --git a/assets/layers/observation_tower/license_info.json b/assets/layers/observation_tower/license_info.json index 06150da7d..ae0cd1a63 100644 --- a/assets/layers/observation_tower/license_info.json +++ b/assets/layers/observation_tower/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Tower_observation.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Teslaton" ], diff --git a/assets/layers/osm_community_index/license_info.json b/assets/layers/osm_community_index/license_info.json index 0dac25a16..d0c1f83df 100644 --- a/assets/layers/osm_community_index/license_info.json +++ b/assets/layers/osm_community_index/license_info.json @@ -1,7 +1,7 @@ [ { "path": "osm.svg", - "license": "ISC License", + "license": "ISC-LICENSE", "authors": [ "osmlab" ], diff --git a/assets/layers/parcel_lockers/license_info.json b/assets/layers/parcel_lockers/license_info.json index 03368e831..1ded4bb52 100644 --- a/assets/layers/parcel_lockers/license_info.json +++ b/assets/layers/parcel_lockers/license_info.json @@ -1,7 +1,7 @@ [ { "path": "parcel_lockers.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Emmanuel Darmon", "Noun Project" diff --git a/assets/layers/parking/license_info.json b/assets/layers/parking/license_info.json index 2c06a382a..ab90844f2 100644 --- a/assets/layers/parking/license_info.json +++ b/assets/layers/parking/license_info.json @@ -1,7 +1,7 @@ [ { "path": "parking.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], diff --git a/assets/layers/parking_spaces/license_info.json b/assets/layers/parking_spaces/license_info.json index e623b60ab..b37536843 100644 --- a/assets/layers/parking_spaces/license_info.json +++ b/assets/layers/parking_spaces/license_info.json @@ -1,7 +1,7 @@ [ { "path": "parking_space.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], diff --git a/assets/layers/parking_ticket_machine/license_info.json b/assets/layers/parking_ticket_machine/license_info.json index 42501091c..ff3518fd3 100644 --- a/assets/layers/parking_ticket_machine/license_info.json +++ b/assets/layers/parking_ticket_machine/license_info.json @@ -1,7 +1,7 @@ [ { "path": "parking_tickets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jérémy Ragusa" ], diff --git a/assets/layers/pharmacy/license_info.json b/assets/layers/pharmacy/license_info.json index ec982334c..4fe5e8929 100644 --- a/assets/layers/pharmacy/license_info.json +++ b/assets/layers/pharmacy/license_info.json @@ -1,7 +1,7 @@ [ { "path": "pharmacy.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM-carto" ], diff --git a/assets/layers/physiotherapist/license_info.json b/assets/layers/physiotherapist/license_info.json index 90889fdc6..8df43c328 100644 --- a/assets/layers/physiotherapist/license_info.json +++ b/assets/layers/physiotherapist/license_info.json @@ -1,7 +1,7 @@ [ { "path": "doctors.svg", - "license": "cc0", + "license": "CC0-1.0", "authors": [ "osmcarto" ], diff --git a/assets/layers/picnic_table/license_info.json b/assets/layers/picnic_table/license_info.json index a56a1c73d..455dcf9f4 100644 --- a/assets/layers/picnic_table/license_info.json +++ b/assets/layers/picnic_table/license_info.json @@ -1,7 +1,7 @@ [ { "path": "picnic_table.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/layers/postboxes/license_info.json b/assets/layers/postboxes/license_info.json index 8e151d9e0..7e18ac808 100644 --- a/assets/layers/postboxes/license_info.json +++ b/assets/layers/postboxes/license_info.json @@ -1,7 +1,7 @@ [ { "path": "postbox.svg", - "license": "CC BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Vincent Le Moign", "https://twitter.com/webalys" diff --git a/assets/layers/postoffices/license_info.json b/assets/layers/postoffices/license_info.json index 252ecfe66..cb64fc07c 100644 --- a/assets/layers/postoffices/license_info.json +++ b/assets/layers/postoffices/license_info.json @@ -1,7 +1,7 @@ [ { "path": "post_office.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "https://github.com/emojione/emojione/graphs/contributors" ], diff --git a/assets/layers/questions/license_info.json b/assets/layers/questions/license_info.json index e29c8330e..7ed8663fd 100644 --- a/assets/layers/questions/license_info.json +++ b/assets/layers/questions/license_info.json @@ -1,7 +1,7 @@ [ { "path": "100euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -12,7 +12,7 @@ }, { "path": "10cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -23,7 +23,7 @@ }, { "path": "10euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -34,7 +34,7 @@ }, { "path": "1cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -45,7 +45,7 @@ }, { "path": "1euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -56,7 +56,7 @@ }, { "path": "200euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -67,7 +67,7 @@ }, { "path": "20cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -78,7 +78,7 @@ }, { "path": "20euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -89,7 +89,7 @@ }, { "path": "2cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -100,7 +100,7 @@ }, { "path": "2euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -111,7 +111,7 @@ }, { "path": "500euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -122,7 +122,7 @@ }, { "path": "50cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -133,7 +133,7 @@ }, { "path": "50euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -144,7 +144,7 @@ }, { "path": "5cent.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -155,7 +155,7 @@ }, { "path": "5euro.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipart", "frankes" @@ -166,7 +166,7 @@ }, { "path": "audio_induction_loop.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Carl Holderness" ], @@ -176,7 +176,7 @@ }, { "path": "audio_induction_loop_missing.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Carl Holderness" ], @@ -186,7 +186,7 @@ }, { "path": "cash.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Online Web Fonts" ], @@ -196,7 +196,7 @@ }, { "path": "coins.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Online Web Fonts" ], @@ -206,7 +206,7 @@ }, { "path": "nfc_card.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Stijn Wens" ], @@ -216,7 +216,7 @@ }, { "path": "no_smoking.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "AIGA" ], @@ -227,7 +227,7 @@ }, { "path": "notes.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Online Web Fonts" ], @@ -237,7 +237,7 @@ }, { "path": "payment_card.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ " \tMaxi Koichi (maxixam)" ], @@ -247,7 +247,7 @@ }, { "path": "phone.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@ tyskrat" ], @@ -257,7 +257,7 @@ }, { "path": "phone.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@ tyskrat" ], @@ -277,19 +277,19 @@ }, { "path": "send_email.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "send_email.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "smartphone.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "To Uyen" ], @@ -299,7 +299,7 @@ }, { "path": "smoking.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Wiki-User03", "ZooFari" diff --git a/assets/layers/reception_desk/license_info.json b/assets/layers/reception_desk/license_info.json index 5afdc20e7..57e9e03a2 100644 --- a/assets/layers/reception_desk/license_info.json +++ b/assets/layers/reception_desk/license_info.json @@ -1,7 +1,7 @@ [ { "path": "reception_desk.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Robin Julien" ], diff --git a/assets/layers/recycling/license_info.json b/assets/layers/recycling/license_info.json index 863587120..c4d0f589e 100644 --- a/assets/layers/recycling/license_info.json +++ b/assets/layers/recycling/license_info.json @@ -1,7 +1,7 @@ [ { "path": "batteries.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -11,7 +11,7 @@ }, { "path": "beverage_cartons.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -21,7 +21,7 @@ }, { "path": "bicycles.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Antwerpenize Bike Font" ], @@ -29,7 +29,7 @@ }, { "path": "cans.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -39,7 +39,7 @@ }, { "path": "clothes.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Adrien Pavie", "modified from EmojiOne 2: U+1F456, U+1F45" @@ -50,7 +50,7 @@ }, { "path": "cooking_oil.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -60,7 +60,7 @@ }, { "path": "engine_oil.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -70,7 +70,7 @@ }, { "path": "fluorescent_tubes.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Noun Project", "shashank singh" @@ -81,7 +81,7 @@ }, { "path": "garden_waste.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick", "modified from Twemoji: U+1F33F" @@ -92,7 +92,7 @@ }, { "path": "glass.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -102,7 +102,7 @@ }, { "path": "glass_bottles.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -112,7 +112,7 @@ }, { "path": "light_bulbs.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OpenClipArt", "fabiovaleggia" @@ -123,7 +123,7 @@ }, { "path": "needles.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://svgsilh.com/image/1294131.html" @@ -131,7 +131,7 @@ }, { "path": "newspaper.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick", "modified from EmojiOne 2: U+1F4F0" @@ -142,7 +142,7 @@ }, { "path": "paper.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -152,7 +152,7 @@ }, { "path": "plastic.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -162,7 +162,7 @@ }, { "path": "plastic_bottles.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -172,7 +172,7 @@ }, { "path": "plastic_packaging.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -182,7 +182,7 @@ }, { "path": "printer_cartridges.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Noun Project", "Zach Bogart" @@ -193,7 +193,7 @@ }, { "path": "recycling-14.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Michael Glanznig" ], @@ -203,7 +203,7 @@ }, { "path": "scrap_metal.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -213,7 +213,7 @@ }, { "path": "shoes.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick", "modified from EmojiOne 2: U+1F45F" @@ -224,7 +224,7 @@ }, { "path": "small_electrical_appliances.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "EmojiOne 2: U+1F50C" ], diff --git a/assets/layers/school/license_info.json b/assets/layers/school/license_info.json index f8c34dde0..595580ece 100644 --- a/assets/layers/school/license_info.json +++ b/assets/layers/school/license_info.json @@ -1,7 +1,7 @@ [ { "path": "college.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki" ], @@ -11,7 +11,7 @@ }, { "path": "school.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Temaki" ], diff --git a/assets/layers/shops/license_info.json b/assets/layers/shops/license_info.json index f86846de2..ec0d3af8a 100644 --- a/assets/layers/shops/license_info.json +++ b/assets/layers/shops/license_info.json @@ -1,7 +1,7 @@ [ { "path": "shop-disused.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki icon set", "Pietervdvn" diff --git a/assets/layers/shower/license_info.json b/assets/layers/shower/license_info.json index c95abdc9e..b0fc02345 100644 --- a/assets/layers/shower/license_info.json +++ b/assets/layers/shower/license_info.json @@ -1,7 +1,7 @@ [ { "path": "shower.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "James" ], diff --git a/assets/layers/slow_roads/license_info.json b/assets/layers/slow_roads/license_info.json index 47f9e03d4..1ee34179c 100644 --- a/assets/layers/slow_roads/license_info.json +++ b/assets/layers/slow_roads/license_info.json @@ -1,7 +1,7 @@ [ { "path": "slow_road.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -12,7 +12,7 @@ }, { "path": "woonerf.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Belgische Wetgever" ], diff --git a/assets/layers/speed_camera/license_info.json b/assets/layers/speed_camera/license_info.json index 6c09b5794..d6b266869 100644 --- a/assets/layers/speed_camera/license_info.json +++ b/assets/layers/speed_camera/license_info.json @@ -1,7 +1,7 @@ [ { "path": "speed_camera.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Earlyswerver", "OpenClipArt" diff --git a/assets/layers/speed_display/license_info.json b/assets/layers/speed_display/license_info.json index 04cf54418..ed6774932 100644 --- a/assets/layers/speed_display/license_info.json +++ b/assets/layers/speed_display/license_info.json @@ -1,7 +1,7 @@ [ { "path": "speed_display.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], diff --git a/assets/layers/sport_pitch/license_info.json b/assets/layers/sport_pitch/license_info.json index a8bdf0d2d..f80b527b3 100644 --- a/assets/layers/sport_pitch/license_info.json +++ b/assets/layers/sport_pitch/license_info.json @@ -1,7 +1,7 @@ [ { "path": "baseball.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -12,7 +12,7 @@ }, { "path": "basketball.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -23,7 +23,7 @@ }, { "path": "beachvolleyball.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -34,7 +34,7 @@ }, { "path": "boules.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -45,7 +45,7 @@ }, { "path": "equestrian.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hufkratzer" ], @@ -56,7 +56,7 @@ }, { "path": "lock.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -67,7 +67,7 @@ }, { "path": "skateboard.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -78,7 +78,7 @@ }, { "path": "soccer.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -89,7 +89,7 @@ }, { "path": "sport_pitch.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -100,7 +100,7 @@ }, { "path": "table_tennis.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -111,7 +111,7 @@ }, { "path": "tennis.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -122,7 +122,7 @@ }, { "path": "volleyball.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], diff --git a/assets/layers/sports_centre/license_info.json b/assets/layers/sports_centre/license_info.json index 0cbc965a6..25fff67a7 100644 --- a/assets/layers/sports_centre/license_info.json +++ b/assets/layers/sports_centre/license_info.json @@ -1,7 +1,7 @@ [ { "path": "sports_centre.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Hello world", "The Noun Project" diff --git a/assets/layers/stairs/license_info.json b/assets/layers/stairs/license_info.json index 5cae5099d..29eb5b169 100644 --- a/assets/layers/stairs/license_info.json +++ b/assets/layers/stairs/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Braille_stairs.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], diff --git a/assets/layers/street_lamps/license_info.json b/assets/layers/street_lamps/license_info.json index 34ca9cd83..315d48867 100644 --- a/assets/layers/street_lamps/license_info.json +++ b/assets/layers/street_lamps/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bent_pole_1.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], @@ -9,7 +9,7 @@ }, { "path": "bent_pole_2.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], @@ -17,7 +17,7 @@ }, { "path": "straight_pole.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], @@ -25,7 +25,7 @@ }, { "path": "street_lamp.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Yohan Boniface" ], diff --git a/assets/layers/toilet/license_info.json b/assets/layers/toilet/license_info.json index 9d629c5b4..11318c592 100644 --- a/assets/layers/toilet/license_info.json +++ b/assets/layers/toilet/license_info.json @@ -1,7 +1,7 @@ [ { "path": "toilets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Toilets-16.svg" @@ -9,7 +9,7 @@ }, { "path": "urinal.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "asianson.design", "Pieter Vander Vennet" @@ -20,7 +20,7 @@ }, { "path": "wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg" diff --git a/assets/layers/trail/license_info.json b/assets/layers/trail/license_info.json index 8f560aaad..4c903667c 100644 --- a/assets/layers/trail/license_info.json +++ b/assets/layers/trail/license_info.json @@ -1,7 +1,7 @@ [ { "path": "pushchair.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], @@ -11,7 +11,7 @@ }, { "path": "trail.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], @@ -21,7 +21,7 @@ }, { "path": "wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg" diff --git a/assets/layers/transit_stops/license_info.json b/assets/layers/transit_stops/license_info.json index 47a736deb..6f9a07dd7 100644 --- a/assets/layers/transit_stops/license_info.json +++ b/assets/layers/transit_stops/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bus_stop.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Andy Allan", "Michael Glanznig", diff --git a/assets/layers/tree_node/license_info.json b/assets/layers/tree_node/license_info.json index f3dd17729..2be4da779 100644 --- a/assets/layers/tree_node/license_info.json +++ b/assets/layers/tree_node/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Onroerend_Erfgoed_logo_without_text.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "M!dgard" ], @@ -11,7 +11,7 @@ }, { "path": "broadleaved.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Midgard" ], @@ -21,7 +21,7 @@ }, { "path": "leafless.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Midgard" ], @@ -31,7 +31,7 @@ }, { "path": "needleleaved.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Midgard" ], @@ -41,7 +41,7 @@ }, { "path": "unknown.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Midgard" ], diff --git a/assets/layers/usersettings/license_info.json b/assets/layers/usersettings/license_info.json index 7035a1db5..b6eb34237 100644 --- a/assets/layers/usersettings/license_info.json +++ b/assets/layers/usersettings/license_info.json @@ -1,7 +1,7 @@ [ { "path": "translate_disabled.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "MGalloway (WMF)" ], @@ -11,7 +11,7 @@ }, { "path": "translate_mobile.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "MGalloway (WMF)", "@ tyskrat" diff --git a/assets/layers/vending_machine/license_info.json b/assets/layers/vending_machine/license_info.json index cfcba1515..c1b450200 100644 --- a/assets/layers/vending_machine/license_info.json +++ b/assets/layers/vending_machine/license_info.json @@ -1,7 +1,7 @@ [ { "path": "cow.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -11,7 +11,7 @@ }, { "path": "egg.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -21,7 +21,7 @@ }, { "path": "honey.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Mushki Brichta" ], @@ -31,7 +31,7 @@ }, { "path": "mug-saucer.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -41,7 +41,7 @@ }, { "path": "potato.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Pavel Melnikov", "The Noun Project" @@ -52,7 +52,7 @@ }, { "path": "smoking.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -62,7 +62,7 @@ }, { "path": "utensils.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -72,7 +72,7 @@ }, { "path": "vending_machine.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Vectorportal.com" ], diff --git a/assets/layers/viewpoint/license_info.json b/assets/layers/viewpoint/license_info.json index cec11d05f..b09822a34 100644 --- a/assets/layers/viewpoint/license_info.json +++ b/assets/layers/viewpoint/license_info.json @@ -1,7 +1,7 @@ [ { "path": "viewpoint.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Viewpoint-16.svg" diff --git a/assets/layers/visitor_information_centre/license_info.json b/assets/layers/visitor_information_centre/license_info.json index fccdb87dc..cc7122c08 100644 --- a/assets/layers/visitor_information_centre/license_info.json +++ b/assets/layers/visitor_information_centre/license_info.json @@ -1,7 +1,7 @@ [ { "path": "information.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bobarino" ], diff --git a/assets/layers/walls_and_buildings/license_info.json b/assets/layers/walls_and_buildings/license_info.json index b59a82e28..f1b15635c 100644 --- a/assets/layers/walls_and_buildings/license_info.json +++ b/assets/layers/walls_and_buildings/license_info.json @@ -1,7 +1,7 @@ [ { "path": "walls_and_buildings.png", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OSM" ], diff --git a/assets/layers/waste_disposal/license_info.json b/assets/layers/waste_disposal/license_info.json index aeeec767e..bb1a120a9 100644 --- a/assets/layers/waste_disposal/license_info.json +++ b/assets/layers/waste_disposal/license_info.json @@ -1,7 +1,7 @@ [ { "path": "waste_disposal.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "kocio-pl" ], diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index fc572a123..7a9540888 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -1,7 +1,7 @@ [ { "path": "SocialImageForeground.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet" ], @@ -11,7 +11,7 @@ }, { "path": "SocialImageForeground.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet" ], @@ -21,7 +21,7 @@ }, { "path": "add.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -29,7 +29,7 @@ }, { "path": "add.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -37,7 +37,7 @@ }, { "path": "addSmall.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -45,7 +45,7 @@ }, { "path": "addSmall.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -53,7 +53,7 @@ }, { "path": "add_pin.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -61,7 +61,7 @@ }, { "path": "back.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -69,7 +69,7 @@ }, { "path": "back.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -77,7 +77,7 @@ }, { "path": "blocked.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -85,7 +85,7 @@ }, { "path": "brick_wall_raw.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -93,7 +93,7 @@ }, { "path": "brick_wall_round.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -101,7 +101,7 @@ }, { "path": "brick_wall_square.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -131,7 +131,7 @@ }, { "path": "camera-plus.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Dave Gandy", "Pieter Vander Vennet" @@ -143,7 +143,7 @@ }, { "path": "camera-plus.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Dave Gandy", "Pieter Vander Vennet" @@ -155,7 +155,7 @@ }, { "path": "checkmark.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -163,7 +163,7 @@ }, { "path": "checkmark.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -171,7 +171,7 @@ }, { "path": "circle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -179,7 +179,7 @@ }, { "path": "circle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -187,7 +187,7 @@ }, { "path": "clock.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -195,7 +195,7 @@ }, { "path": "clock.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -203,19 +203,19 @@ }, { "path": "close.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "close.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "community.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -223,19 +223,19 @@ }, { "path": "compass.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "compass.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "confirm.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -243,7 +243,7 @@ }, { "path": "copyright.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hannah Declerck" ], @@ -251,37 +251,37 @@ }, { "path": "cross_bottom_right.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "cross_bottom_right.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair-locked.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "crosshair.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "delete_icon.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Dave Gandy" ], @@ -291,7 +291,7 @@ }, { "path": "delete_icon.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Dave Gandy" ], @@ -301,7 +301,7 @@ }, { "path": "delete_not_allowed.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -309,19 +309,19 @@ }, { "path": "direction_gradient.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "direction_gradient.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "direction_stroke.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -329,7 +329,7 @@ }, { "path": "direction_stroke.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -337,7 +337,7 @@ }, { "path": "download.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hannah Declerck" ], @@ -345,7 +345,7 @@ }, { "path": "download.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Engr.eponce" ], @@ -355,7 +355,7 @@ }, { "path": "duplicate.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -363,7 +363,7 @@ }, { "path": "elevator.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Yveltal" ], @@ -373,7 +373,7 @@ }, { "path": "elevator_wheelchair.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Robin Julien" ], @@ -383,19 +383,19 @@ }, { "path": "envelope.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "envelope.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "eye.svg", - "license": "CC-BY-SA 3.0 Unported", + "license": "CC-BY-SA-3.0-UNPORTED", "authors": [ "Dave Gandy" ], @@ -405,7 +405,7 @@ }, { "path": "filter.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hannah Declerck" ], @@ -413,7 +413,7 @@ }, { "path": "filter_disable.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hannah Declerck" ], @@ -421,7 +421,7 @@ }, { "path": "floppy.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The Tango Desktop Project" ], @@ -432,7 +432,7 @@ }, { "path": "floppy.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The Tango Desktop Project" ], @@ -443,7 +443,7 @@ }, { "path": "floppy.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The Tango! Desktop Project" ], @@ -453,19 +453,19 @@ }, { "path": "gear.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "gear.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "gender_bi.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -475,7 +475,7 @@ }, { "path": "gender_female.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -485,7 +485,7 @@ }, { "path": "gender_inter.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -495,7 +495,7 @@ }, { "path": "gender_male.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -505,7 +505,7 @@ }, { "path": "gender_queer.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -515,7 +515,7 @@ }, { "path": "gender_trans.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Gender Icon Pack" ], @@ -525,7 +525,7 @@ }, { "path": "generic_map.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Svg Repo" ], @@ -535,7 +535,7 @@ }, { "path": "gps_arrow.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -543,7 +543,7 @@ }, { "path": "hand.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Anomie" ], @@ -553,19 +553,19 @@ }, { "path": "help.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "help.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "home.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Timothy Miller" ], @@ -575,7 +575,7 @@ }, { "path": "home.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Timothy Miller" ], @@ -585,7 +585,7 @@ }, { "path": "invalid.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji" ], @@ -595,7 +595,7 @@ }, { "path": "josm_logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "JOSM Team" ], @@ -606,7 +606,7 @@ }, { "path": "josm_logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "JOSM Team" ], @@ -617,19 +617,19 @@ }, { "path": "layers.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "layers.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "length-crosshair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -637,7 +637,7 @@ }, { "path": "liberapay.svg", - "license": "Logo (all rights reserved)", + "license": "LOGO-(ALL-RIGHTS-RESERVED)", "authors": [ "LiberaPay" ], @@ -647,13 +647,13 @@ }, { "path": "loading.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "location-empty.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pol Labaut" ], @@ -661,7 +661,7 @@ }, { "path": "location-refused.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -669,7 +669,7 @@ }, { "path": "location.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Hannah Declerck" ], @@ -677,7 +677,7 @@ }, { "path": "location_locked.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -685,7 +685,7 @@ }, { "path": "location_unlocked.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -693,7 +693,7 @@ }, { "path": "login.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -701,31 +701,31 @@ }, { "path": "logo.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "logo.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "logout.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "logout.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "mapcomplete_logo.svg", - "license": "Logo; CC-BY-SA", + "license": "LOGO; CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet", " OSM" @@ -736,7 +736,7 @@ }, { "path": "mapcomplete_logo.svg", - "license": "Logo; CC-BY-SA", + "license": "LOGO; CC-BY-SA-4.0", "authors": [ "Pieter Vander Vennet", " OSM" @@ -747,7 +747,7 @@ }, { "path": "mapillary.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Mapillary" ], @@ -757,7 +757,7 @@ }, { "path": "mapillary.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Mapillary" ], @@ -767,7 +767,7 @@ }, { "path": "mapillary_black.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Mapillary" ], @@ -777,7 +777,7 @@ }, { "path": "mapillary_black.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Mapillary" ], @@ -787,7 +787,7 @@ }, { "path": "mastodon.svg", - "license": "Logo; GNU Affero General Public License", + "license": "LOGO; GNU-AFFERO-GENERAL-PUBLIC-LICENSE", "authors": [ "Mastodon" ], @@ -797,19 +797,19 @@ }, { "path": "min.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "min.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "move-arrows.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -817,7 +817,7 @@ }, { "path": "move.svg", - "license": "CC-BY-SA 3.0 Unported", + "license": "CC-BY-SA-3.0-UNPORTED", "authors": [ "MGalloway (WMF)" ], @@ -827,7 +827,7 @@ }, { "path": "move_confirm.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -835,7 +835,7 @@ }, { "path": "move_not_allowed.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -843,25 +843,25 @@ }, { "path": "no_checkmark.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "no_checkmark.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "none.svg", - "license": "trivial", + "license": "TRIVIAL", "authors": [], "sources": [] }, { "path": "not_found.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji" ], @@ -871,7 +871,7 @@ }, { "path": "note.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -879,7 +879,7 @@ }, { "path": "osm-logo-us.svg", - "license": "Logo", + "license": "LOGO", "authors": [ "OpenStreetMap U.S. Chapter" ], @@ -889,7 +889,7 @@ }, { "path": "osm-logo-us.svg", - "license": "Logo", + "license": "LOGO", "authors": [ "OpenStreetMap U.S. Chapter" ], @@ -899,7 +899,7 @@ }, { "path": "osm-logo.svg", - "license": "logo; all rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -907,7 +907,7 @@ }, { "path": "osm-logo.svg", - "license": "logo; all rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [], "sources": [ "https://www.OpenStreetMap.org" @@ -915,7 +915,7 @@ }, { "path": "party.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji" ], @@ -947,7 +947,7 @@ }, { "path": "person.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -955,19 +955,19 @@ }, { "path": "pin.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "pin.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "plantnet_logo.svg", - "license": "Logo (fair usage)", + "license": "LOGO-(FAIR-USAGE)", "authors": [ "https://plantnet.org" ], @@ -977,19 +977,19 @@ }, { "path": "plus.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "plus.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "pop-out.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@fatih" ], @@ -999,7 +999,7 @@ }, { "path": "pop-out.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@fatih" ], @@ -1009,19 +1009,19 @@ }, { "path": "reload.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "reload.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "relocation.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -1029,7 +1029,7 @@ }, { "path": "resolved.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -1037,19 +1037,19 @@ }, { "path": "ring.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "ring.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "robot.svg", - "license": "CC-BY 4.0 International", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], @@ -1059,7 +1059,7 @@ }, { "path": "satellite.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "SVG Repo" ], @@ -1069,7 +1069,7 @@ }, { "path": "scissors.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "The noun project - Icons8" ], @@ -1113,19 +1113,19 @@ }, { "path": "share.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "share.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "speech_bubble.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji" ], @@ -1135,7 +1135,7 @@ }, { "path": "speech_bubble_black_outline.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji" ], @@ -1145,67 +1145,67 @@ }, { "path": "square.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "square.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_half.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_half.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline_half.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "star_outline_half.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "statistics.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@felpgrc" ], @@ -1215,7 +1215,7 @@ }, { "path": "statistics.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@felpgrc" ], @@ -1225,7 +1225,7 @@ }, { "path": "teardrop.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -1233,7 +1233,7 @@ }, { "path": "teardrop_with_hole_green.svg", - "license": "Creative Commons 4.0 BY-NC", + "license": "CREATIVE-COMMONS-4.0-BY-NC", "authors": [], "sources": [ "https://pngimg.com/image/46283" @@ -1241,7 +1241,7 @@ }, { "path": "translate.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "MGalloway (WMF)" ], @@ -1251,7 +1251,7 @@ }, { "path": "translate.svg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "MGalloway (WMF)" ], @@ -1261,7 +1261,7 @@ }, { "path": "triangle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], @@ -1269,19 +1269,19 @@ }, { "path": "up.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "up.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "upload.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -1289,7 +1289,7 @@ }, { "path": "wikidata.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikidata" ], @@ -1299,7 +1299,7 @@ }, { "path": "wikidata.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikidata" ], @@ -1309,7 +1309,7 @@ }, { "path": "wikimedia-commons-white.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikimedia" ], @@ -1319,7 +1319,7 @@ }, { "path": "wikimedia-commons-white.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikimedia" ], @@ -1329,7 +1329,7 @@ }, { "path": "wikipedia.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikipedia" ], @@ -1339,7 +1339,7 @@ }, { "path": "wikipedia.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Wikipedia" ], diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json index b813d045e..d47f217a3 100644 --- a/assets/themes/advertising/license_info.json +++ b/assets/themes/advertising/license_info.json @@ -1,7 +1,7 @@ [ { "path": "AdvertisingColumn_001.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargs" ], @@ -11,7 +11,7 @@ }, { "path": "AdvertisingColumn_003.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargsed" ], @@ -21,7 +21,7 @@ }, { "path": "AdvertisingTotem_003.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargsed" ], @@ -31,7 +31,7 @@ }, { "path": "AdvertisingTotem_004.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargsed" ], @@ -41,7 +41,7 @@ }, { "path": "Advertising_flag.jpg", - "license": "CC BY-SA 2.0", + "license": "CC-BY-SA-2.0", "authors": [ "Sandy B" ], @@ -51,7 +51,7 @@ }, { "path": "Aircraft_Sculpture.jpg", - "license": "CC BY-SA 2.0", + "license": "CC-BY-SA-2.0", "authors": [ "Rod Waddington" ], @@ -61,7 +61,7 @@ }, { "path": "BS.JPG", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "TeWeBs" ], @@ -71,7 +71,7 @@ }, { "path": "Capitol_wall.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Artaxerxes" ], @@ -81,7 +81,7 @@ }, { "path": "City-Light-Poster.jpg", - "license": "CC-BY SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Bärwinkel, Klaus" ], @@ -91,7 +91,7 @@ }, { "path": "FGV_Founding.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Paunofu" ], @@ -101,7 +101,7 @@ }, { "path": "JR_Central.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "ジェーアール東海一口株主" ], @@ -111,7 +111,7 @@ }, { "path": "KFC_Billboard.jpg", - "license": "CC BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Paunofu" ], @@ -121,7 +121,7 @@ }, { "path": "LIDL_Billboard.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Paul Williams" ], @@ -131,7 +131,7 @@ }, { "path": "Lidl_totem.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Donald Trung" ], @@ -141,7 +141,7 @@ }, { "path": "Mug.jpg", - "license": "Public Domain", + "license": "PUBLIC-DOMAIN", "authors": [ "Carol M. Highsmith" ], @@ -151,7 +151,7 @@ }, { "path": "Mupi_Alcoi.jpg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Paunofu" ], @@ -161,7 +161,7 @@ }, { "path": "Mupi_spain.jpg", - "license": "CC0 1.0", + "license": "CC0-1.0", "authors": [ "Jusotil_1943" ], @@ -171,7 +171,7 @@ }, { "path": "Repsol_Billboard.jpg", - "license": "CC BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Paunofu" ], @@ -181,7 +181,7 @@ }, { "path": "Screen_poster_box.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "T. Segonds" ], @@ -191,7 +191,7 @@ }, { "path": "Small_Board.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargsed" ], @@ -201,7 +201,7 @@ }, { "path": "Subway_screen.jpg", - "license": "CC BY 2.0", + "license": "CC-BY-2.0", "authors": [ "Metropolitan Transportation Authority of the State of New York" ], @@ -211,7 +211,7 @@ }, { "path": "TV_media.jpg", - "license": "CC BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Roger Carvell" ], @@ -221,7 +221,7 @@ }, { "path": "Times square.jpg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "chensiyuan" ], @@ -231,7 +231,7 @@ }, { "path": "Waitrose_sign.jpg", - "license": "CC BY-SA 2.0", + "license": "CC-BY-SA-2.0", "authors": [ "Geographer" ], @@ -241,7 +241,7 @@ }, { "path": "billboard.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -251,7 +251,7 @@ }, { "path": "board.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -261,7 +261,7 @@ }, { "path": "clarke_wall.jpg", - "license": "CC BY-SA 2.0", + "license": "CC-BY-SA-2.0", "authors": [ "Albert Bridge" ], @@ -271,7 +271,7 @@ }, { "path": "column.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -281,7 +281,7 @@ }, { "path": "farma_sign.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "paunofu" ], @@ -291,7 +291,7 @@ }, { "path": "flag.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38", "Ash Crow", @@ -306,7 +306,7 @@ }, { "path": "icon.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Panier Avide" ], @@ -316,7 +316,7 @@ }, { "path": "local_Board.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Segnargsed" ], @@ -326,7 +326,7 @@ }, { "path": "newspaper_kiosk.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -336,7 +336,7 @@ }, { "path": "poster_box.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -346,7 +346,7 @@ }, { "path": "poster_box_no_support.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -356,7 +356,7 @@ }, { "path": "screen alcoi.jpg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "paunofu" ], @@ -366,7 +366,7 @@ }, { "path": "screen.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Barnes38", "Pietervdvn" @@ -377,7 +377,7 @@ }, { "path": "screen_no_support.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Barnes38", "Pietervdvn" @@ -388,7 +388,7 @@ }, { "path": "sculpture.svg", - "license": "CC BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Nathaniel Smith", "Pietervdvn" @@ -400,7 +400,7 @@ }, { "path": "sign.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -410,7 +410,7 @@ }, { "path": "sign_EOI.jpg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "paunofu" ], @@ -420,7 +420,7 @@ }, { "path": "tarp.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38", "Pietervdvn" @@ -431,7 +431,7 @@ }, { "path": "tarp_feder.jpg", - "license": "CC-BY SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "paunofu" ], @@ -441,7 +441,7 @@ }, { "path": "tarp_madrid.jpg", - "license": "CC BY 2.0", + "license": "CC-BY-2.0", "authors": [ "Rogotan" ], @@ -451,7 +451,7 @@ }, { "path": "totem.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38" ], @@ -461,7 +461,7 @@ }, { "path": "trivision.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "pietervdvn", "Louis Dawson (via the Noun Project)" @@ -472,7 +472,7 @@ }, { "path": "wall_painting.svg", - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "Barnes38", "Pietervdvn" diff --git a/assets/themes/aed/license_info.json b/assets/themes/aed/license_info.json index dac608205..fb19d46a7 100644 --- a/assets/themes/aed/license_info.json +++ b/assets/themes/aed/license_info.json @@ -1,7 +1,7 @@ [ { "path": "aed.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "MaxxL" ], diff --git a/assets/themes/artwork/license_info.json b/assets/themes/artwork/license_info.json index 1de90de4e..358b8daf9 100644 --- a/assets/themes/artwork/license_info.json +++ b/assets/themes/artwork/license_info.json @@ -1,7 +1,7 @@ [ { "path": "artwork.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Statue-14.svg" diff --git a/assets/themes/atm/license_info.json b/assets/themes/atm/license_info.json index f4685f1ab..f77affc5d 100644 --- a/assets/themes/atm/license_info.json +++ b/assets/themes/atm/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Michael Glanznig", "Andy Allan" diff --git a/assets/themes/bag/license_info.json b/assets/themes/bag/license_info.json index 0feae26b3..12c529296 100644 --- a/assets/themes/bag/license_info.json +++ b/assets/themes/bag/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Wouter van der Wal" ], diff --git a/assets/themes/benches/license_info.json b/assets/themes/benches/license_info.json index 853abcb87..3449ab5a1 100644 --- a/assets/themes/benches/license_info.json +++ b/assets/themes/benches/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bench_poi.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -12,7 +12,7 @@ }, { "path": "bench_public_transport.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], diff --git a/assets/themes/bicycle_rental/license_info.json b/assets/themes/bicycle_rental/license_info.json index 46d07e516..72d83e093 100644 --- a/assets/themes/bicycle_rental/license_info.json +++ b/assets/themes/bicycle_rental/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -12,7 +12,7 @@ }, { "path": "rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], diff --git a/assets/themes/bicyclelib/license_info.json b/assets/themes/bicyclelib/license_info.json index d186e73a2..8f6e1f424 100644 --- a/assets/themes/bicyclelib/license_info.json +++ b/assets/themes/bicyclelib/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/themes/blind_osm/license_info.json b/assets/themes/blind_osm/license_info.json index 82b1c85ba..96cff081a 100644 --- a/assets/themes/blind_osm/license_info.json +++ b/assets/themes/blind_osm/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Blindicon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Abu badali", "AIGA" diff --git a/assets/themes/bookcases/license_info.json b/assets/themes/bookcases/license_info.json index 05dd6672c..a53e3af60 100644 --- a/assets/themes/bookcases/license_info.json +++ b/assets/themes/bookcases/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bookcase.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Public_bookcase-14.svg" diff --git a/assets/themes/buurtnatuur/license_info.json b/assets/themes/buurtnatuur/license_info.json index 0b35721f9..ff5eb0f61 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; ALL-RIGHTS-RESERVED", "authors": [ "Agentschap Natuur en Bos" ], @@ -11,7 +11,7 @@ }, { "path": "Natuurpunt.jpg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Natuurpunt" ], @@ -21,7 +21,7 @@ }, { "path": "forest.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@ Federico Sibella" ], @@ -31,7 +31,7 @@ }, { "path": "groen_logo.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Groen" ], @@ -41,7 +41,7 @@ }, { "path": "logo.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Groen" ], @@ -51,7 +51,7 @@ }, { "path": "nature_reserve.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@ Эдуард Черных" ], @@ -61,7 +61,7 @@ }, { "path": "park.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "@sterankofrank" ], @@ -71,7 +71,7 @@ }, { "path": "social_image.jpg", - "license": "All rights reserved", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "Groen" ], diff --git a/assets/themes/campersite/license_info.json b/assets/themes/campersite/license_info.json index d1b076033..2446a14ce 100644 --- a/assets/themes/campersite/license_info.json +++ b/assets/themes/campersite/license_info.json @@ -1,7 +1,7 @@ [ { "path": "caravan.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OsmAnd" ], @@ -12,7 +12,7 @@ }, { "path": "caravan_green.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OsmAnd" ], @@ -23,7 +23,7 @@ }, { "path": "sanitary_dump_station.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "OsmAnd" ], @@ -34,7 +34,7 @@ }, { "path": "social_image.jpg", - "license": "CC-BY-SA 3.0", + "license": "CC-BY-SA-3.0", "authors": [ "ES01" ], diff --git a/assets/themes/charging_stations/license_info.json b/assets/themes/charging_stations/license_info.json index 58aeb1bc4..87331691c 100644 --- a/assets/themes/charging_stations/license_info.json +++ b/assets/themes/charging_stations/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bicycle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Stijn Wens" ], @@ -12,7 +12,7 @@ }, { "path": "car.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Simon Child", "The Noun Project" @@ -23,13 +23,13 @@ }, { "path": "logo.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] }, { "path": "plug.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [], "sources": [] } diff --git a/assets/themes/climbing/license_info.json b/assets/themes/climbing/license_info.json index 25988a9fc..e0cbdc9b5 100644 --- a/assets/themes/climbing/license_info.json +++ b/assets/themes/climbing/license_info.json @@ -1,7 +1,7 @@ [ { "path": "carabiner.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Matthew Dera" ], @@ -11,7 +11,7 @@ }, { "path": "climbing_gym.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -24,7 +24,7 @@ }, { "path": "climbing_icon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -37,7 +37,7 @@ }, { "path": "climbing_no_rope.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -50,7 +50,7 @@ }, { "path": "climbing_rope.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -63,7 +63,7 @@ }, { "path": "climbing_route.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -76,7 +76,7 @@ }, { "path": "climbing_unknown.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -89,7 +89,7 @@ }, { "path": "club.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Polarbear w", "Christian Neumann" @@ -102,7 +102,7 @@ }, { "path": "height.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/themes/cycle_highways/license_info.json b/assets/themes/cycle_highways/license_info.json index 9f6d28f6e..d34b04f2c 100644 --- a/assets/themes/cycle_highways/license_info.json +++ b/assets/themes/cycle_highways/license_info.json @@ -1,7 +1,7 @@ [ { "path": "fietssnelwegen-logo.svg", - "license": "Logo by the government", + "license": "LOGO-BY-THE-GOVERNMENT", "authors": [ "De Vlaamse Provincies" ], diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json index 0b84e1df2..cea470991 100644 --- a/assets/themes/cycle_infra/license_info.json +++ b/assets/themes/cycle_infra/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Cycle_barrier_double.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "Cycle_barrier_double_length.png", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -17,7 +17,7 @@ }, { "path": "Cycle_barrier_double_length.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -25,7 +25,7 @@ }, { "path": "Cycle_barrier_double_overlap.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -33,7 +33,7 @@ }, { "path": "Cycle_barrier_double_template.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -41,7 +41,7 @@ }, { "path": "Cycle_barrier_double_width.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -49,7 +49,7 @@ }, { "path": "Cycle_barrier_single.png", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Supaplex030" ], @@ -59,7 +59,7 @@ }, { "path": "Cycle_barrier_squeeze.png", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Supaplex030" ], @@ -69,7 +69,7 @@ }, { "path": "Cycle_barrier_triple.png", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Supaplex030" ], @@ -79,7 +79,7 @@ }, { "path": "bicycleway.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], @@ -89,7 +89,7 @@ }, { "path": "cycle-infra.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Dávid Gladiš", "Hannah Declerck" @@ -100,7 +100,7 @@ }, { "path": "street.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Tobias Zwick" ], diff --git a/assets/themes/cyclestreets/license_info.json b/assets/themes/cyclestreets/license_info.json index a4e2abcd7..95295fc2c 100644 --- a/assets/themes/cyclestreets/license_info.json +++ b/assets/themes/cyclestreets/license_info.json @@ -1,7 +1,7 @@ [ { "path": "F111.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The RedBurn" ], @@ -11,7 +11,7 @@ }, { "path": "F113.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The RedBurn" ], @@ -21,7 +21,7 @@ }, { "path": "Finland_road_sign_E28.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Suomen tasavalta" ], @@ -31,7 +31,7 @@ }, { "path": "Finland_road_sign_E29.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Suomen tasavalta" ], @@ -41,7 +41,7 @@ }, { "path": "Zeichen_244.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -51,7 +51,7 @@ }, { "path": "Zeichen_244_1020-30.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -62,7 +62,7 @@ }, { "path": "Zeichen_244_1022-12.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -73,7 +73,7 @@ }, { "path": "Zeichen_244_1024-10.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -84,7 +84,7 @@ }, { "path": "Zeichen_244_KFZ_frei.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -95,7 +95,7 @@ }, { "path": "Zeichen_244a.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bundesministerium für Verkehr, Bau- und Wohnungswesen" ], @@ -105,7 +105,7 @@ }, { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The RedBurn" ], diff --git a/assets/themes/cyclofix/license_info.json b/assets/themes/cyclofix/license_info.json index a2d52d737..165ac31ec 100644 --- a/assets/themes/cyclofix/license_info.json +++ b/assets/themes/cyclofix/license_info.json @@ -1,7 +1,7 @@ [ { "path": "fietsambassade_gent_logo.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "De Fietsambassade" ], @@ -11,7 +11,7 @@ }, { "path": "fietsambassade_gent_logo_small.svg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "De Fietsambassade" ], @@ -21,7 +21,7 @@ }, { "path": "key.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Stijn Wens" ], @@ -31,7 +31,7 @@ }, { "path": "logo.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/themes/drinking_water/license_info.json b/assets/themes/drinking_water/license_info.json index 4e551be4e..2f710ae70 100644 --- a/assets/themes/drinking_water/license_info.json +++ b/assets/themes/drinking_water/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "Pieter Fiers", "Thibault Declercq", diff --git a/assets/themes/elongated_coin/license_info.json b/assets/themes/elongated_coin/license_info.json index 778c73624..a51560834 100644 --- a/assets/themes/elongated_coin/license_info.json +++ b/assets/themes/elongated_coin/license_info.json @@ -1,7 +1,7 @@ [ { "path": "penny.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], diff --git a/assets/themes/facadegardens/license_info.json b/assets/themes/facadegardens/license_info.json index 530e70a4e..eec27be4c 100644 --- a/assets/themes/facadegardens/license_info.json +++ b/assets/themes/facadegardens/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bloei.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -11,7 +11,7 @@ }, { "path": "bodembedekker.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -21,7 +21,7 @@ }, { "path": "eetbaar.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -31,7 +31,7 @@ }, { "path": "gevelton.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -41,7 +41,7 @@ }, { "path": "geveltuin.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -51,7 +51,7 @@ }, { "path": "halfzon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -61,7 +61,7 @@ }, { "path": "klimplant.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -71,7 +71,7 @@ }, { "path": "schaduw.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -81,7 +81,7 @@ }, { "path": "struik.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], @@ -91,7 +91,7 @@ }, { "path": "zon.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Klimaan VZW" ], diff --git a/assets/themes/fritures/license_info.json b/assets/themes/fritures/license_info.json index 485698d14..5fc6a828d 100644 --- a/assets/themes/fritures/license_info.json +++ b/assets/themes/fritures/license_info.json @@ -1,7 +1,7 @@ [ { "path": "fries.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], @@ -11,7 +11,7 @@ }, { "path": "logo.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], diff --git a/assets/themes/fruit_trees/license_info.json b/assets/themes/fruit_trees/license_info.json index 5179e7624..3a4a3a0a0 100644 --- a/assets/themes/fruit_trees/license_info.json +++ b/assets/themes/fruit_trees/license_info.json @@ -1,7 +1,7 @@ [ { "path": "fruit_tree.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "The Noun Project" ], diff --git a/assets/themes/ghostbikes/license_info.json b/assets/themes/ghostbikes/license_info.json index d186e73a2..8f6e1f424 100644 --- a/assets/themes/ghostbikes/license_info.json +++ b/assets/themes/ghostbikes/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/themes/grb/license_info.json b/assets/themes/grb/license_info.json index 0a00dc73a..0b2aa86bd 100644 --- a/assets/themes/grb/license_info.json +++ b/assets/themes/grb/license_info.json @@ -1,7 +1,7 @@ [ { "path": "housenumber_blank.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -17,7 +17,7 @@ }, { "path": "warning.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "penubag" ], diff --git a/assets/themes/hackerspaces/license_info.json b/assets/themes/hackerspaces/license_info.json index d8dc08dae..a7d215d9c 100644 --- a/assets/themes/hackerspaces/license_info.json +++ b/assets/themes/hackerspaces/license_info.json @@ -1,7 +1,7 @@ [ { "path": "glider.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Bryan.burgers" ], @@ -11,7 +11,7 @@ }, { "path": "led.png", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Tommaso.sansone91" ], diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json index 4896dfd32..848611b3b 100644 --- a/assets/themes/hailhydrant/license_info.json +++ b/assets/themes/hailhydrant/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Twemoji12_1f692.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji Project" ], @@ -12,7 +12,7 @@ }, { "path": "Twemoji12_1f9ef.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji Project" ], @@ -23,7 +23,7 @@ }, { "path": "Twemoji12_26d1.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji Project" ], @@ -34,7 +34,7 @@ }, { "path": "Twemoji_1f691.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Twemoji Project" ], @@ -55,7 +55,7 @@ }, { "path": "hydrant.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "GOwin" ], @@ -65,7 +65,7 @@ }, { "path": "hydrant_pillar.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "M!dgard" ], @@ -76,7 +76,7 @@ }, { "path": "hydrant_underground.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "M!dgard" ], @@ -87,7 +87,7 @@ }, { "path": "hydrant_unknown.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "M!dgard" ], @@ -98,7 +98,7 @@ }, { "path": "logo.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Erwin Olario" ], diff --git a/assets/themes/maps/license_info.json b/assets/themes/maps/license_info.json index 19b9ea488..bd5054045 100644 --- a/assets/themes/maps/license_info.json +++ b/assets/themes/maps/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "CC0" ], diff --git a/assets/themes/maxspeed/license_info.json b/assets/themes/maxspeed/license_info.json index 3aa1a76fc..10d2959b2 100644 --- a/assets/themes/maxspeed/license_info.json +++ b/assets/themes/maxspeed/license_info.json @@ -1,7 +1,7 @@ [ { "path": "maxspeed_10 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -11,7 +11,7 @@ }, { "path": "maxspeed_100 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -21,7 +21,7 @@ }, { "path": "maxspeed_110 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -31,7 +31,7 @@ }, { "path": "maxspeed_120 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -41,7 +41,7 @@ }, { "path": "maxspeed_130 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -51,7 +51,7 @@ }, { "path": "maxspeed_140 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -61,7 +61,7 @@ }, { "path": "maxspeed_20 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -71,7 +71,7 @@ }, { "path": "maxspeed_30 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -81,7 +81,7 @@ }, { "path": "maxspeed_40 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -91,7 +91,7 @@ }, { "path": "maxspeed_50 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -101,7 +101,7 @@ }, { "path": "maxspeed_60 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -111,7 +111,7 @@ }, { "path": "maxspeed_70 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -121,7 +121,7 @@ }, { "path": "maxspeed_80 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -131,7 +131,7 @@ }, { "path": "maxspeed_90 mph.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], @@ -141,7 +141,7 @@ }, { "path": "maxspeed_logo.svg", - "license": "CC 4.0", + "license": "CC-BY-4.0", "authors": [ "yopaseopor" ], diff --git a/assets/themes/nature/license_info.json b/assets/themes/nature/license_info.json index ee20dd9c4..e69d09647 100644 --- a/assets/themes/nature/license_info.json +++ b/assets/themes/nature/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC-BY 4.0", + "license": "CC-BY-4.0", "authors": [ "Font Awesome" ], diff --git a/assets/themes/notes/license_info.json b/assets/themes/notes/license_info.json index d186e73a2..8f6e1f424 100644 --- a/assets/themes/notes/license_info.json +++ b/assets/themes/notes/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/themes/onwheels/license_info.json b/assets/themes/onwheels/license_info.json index c088ed77a..33a5bb2db 100644 --- a/assets/themes/onwheels/license_info.json +++ b/assets/themes/onwheels/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bicycle_pump.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -11,7 +11,7 @@ }, { "path": "cafe.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -21,7 +21,7 @@ }, { "path": "cone.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -31,7 +31,7 @@ }, { "path": "crest.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Free Wheelies" ], @@ -39,7 +39,7 @@ }, { "path": "doctor.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -49,7 +49,7 @@ }, { "path": "elevator.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -59,7 +59,7 @@ }, { "path": "entrance.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -69,7 +69,7 @@ }, { "path": "government.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -79,7 +79,7 @@ }, { "path": "hospital.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -89,7 +89,7 @@ }, { "path": "hotel.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -99,7 +99,7 @@ }, { "path": "parking.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -109,7 +109,7 @@ }, { "path": "pharmacy.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -119,7 +119,7 @@ }, { "path": "repair.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -129,7 +129,7 @@ }, { "path": "restaurant.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -139,7 +139,7 @@ }, { "path": "shop.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], @@ -149,7 +149,7 @@ }, { "path": "toilet.svg", - "license": "CC-BY-SA", + "license": "CC-BY-SA-4.0", "authors": [ "CT Steward" ], diff --git a/assets/themes/openwindpowermap/license_info.json b/assets/themes/openwindpowermap/license_info.json index d7986e80b..0c8447a5a 100644 --- a/assets/themes/openwindpowermap/license_info.json +++ b/assets/themes/openwindpowermap/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Iconathon" ], @@ -11,7 +11,7 @@ }, { "path": "wind_turbine.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Iconathon" ], diff --git a/assets/themes/osm_community_index/license_info.json b/assets/themes/osm_community_index/license_info.json index 0dac25a16..d0c1f83df 100644 --- a/assets/themes/osm_community_index/license_info.json +++ b/assets/themes/osm_community_index/license_info.json @@ -1,7 +1,7 @@ [ { "path": "osm.svg", - "license": "ISC License", + "license": "ISC-LICENSE", "authors": [ "osmlab" ], diff --git a/assets/themes/parkings/license_info.json b/assets/themes/parkings/license_info.json index fe3691385..7614790a3 100644 --- a/assets/themes/parkings/license_info.json +++ b/assets/themes/parkings/license_info.json @@ -1,7 +1,7 @@ [ { "path": "parkings.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Freepik" ], diff --git a/assets/themes/pets/license_info.json b/assets/themes/pets/license_info.json index cbdbb93c7..be5931c92 100644 --- a/assets/themes/pets/license_info.json +++ b/assets/themes/pets/license_info.json @@ -14,7 +14,7 @@ }, { "path": "dogshop.svg", - "license": "CC0 1.0", + "license": "CC0-1.0", "authors": [ "Public Domain Symbols", "Niels Elgaard Larsen" @@ -25,7 +25,7 @@ }, { "path": "petshop.svg", - "license": "CC0 1.0", + "license": "CC0-1.0", "authors": [ "Niels Elgaard Larsen", "Public Domain Symbols" diff --git a/assets/themes/playgrounds/license_info.json b/assets/themes/playgrounds/license_info.json index c0ce1d15b..1f39cce00 100644 --- a/assets/themes/playgrounds/license_info.json +++ b/assets/themes/playgrounds/license_info.json @@ -1,7 +1,7 @@ [ { "path": "playground.svg", - "license": "CC-BY 3.0", + "license": "CC-BY-3.0", "authors": [ "Scott de Jonge" ], diff --git a/assets/themes/postal_codes/license_info.json b/assets/themes/postal_codes/license_info.json index 31eca5e79..ca527b94e 100644 --- a/assets/themes/postal_codes/license_info.json +++ b/assets/themes/postal_codes/license_info.json @@ -1,7 +1,7 @@ [ { "path": "townhall.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Nebulon42" ], diff --git a/assets/themes/rainbow_crossings/license_info.json b/assets/themes/rainbow_crossings/license_info.json index ff2acdfd7..66c3517c2 100644 --- a/assets/themes/rainbow_crossings/license_info.json +++ b/assets/themes/rainbow_crossings/license_info.json @@ -1,7 +1,7 @@ [ { "path": "crossing.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "bxl-forever" ], @@ -9,7 +9,7 @@ }, { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "bxl-forever" ], diff --git a/assets/themes/shops/license_info.json b/assets/themes/shops/license_info.json index 0abf6e976..cc73f679e 100644 --- a/assets/themes/shops/license_info.json +++ b/assets/themes/shops/license_info.json @@ -1,7 +1,7 @@ [ { "path": "shop.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Convenience-14.svg" diff --git a/assets/themes/speelplekken/license_info.json b/assets/themes/speelplekken/license_info.json index 2bfa81a9c..6842601cc 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; ALL-RIGHTS-RESERVED", "authors": [ "Departement Omgeving, Vlaamse Overheid" ], @@ -11,7 +11,7 @@ }, { "path": "logo.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -22,7 +22,7 @@ }, { "path": "provincie_antwerpen.jpg", - "license": "Logo; All rights reserved", + "license": "LOGO; ALL-RIGHTS-RESERVED", "authors": [ "Provincie Antwerpen" ], @@ -32,7 +32,7 @@ }, { "path": "social_image.jpg", - "license": "Logo (all rights reserved)", + "license": "LOGO-(ALL-RIGHTS-RESERVED)", "authors": [ "Createlli" ], @@ -42,7 +42,7 @@ }, { "path": "speelbos.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -53,7 +53,7 @@ }, { "path": "speeltuin.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -64,7 +64,7 @@ }, { "path": "speelweide.svg", - "license": "CC-BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " ], @@ -75,7 +75,7 @@ }, { "path": "youtube.svg", - "license": "Logo (all rights reserved)", + "license": "LOGO-(ALL-RIGHTS-RESERVED)", "authors": [ "Youtube" ], diff --git a/assets/themes/sports/license_info.json b/assets/themes/sports/license_info.json index 933127962..adfb2a0a3 100644 --- a/assets/themes/sports/license_info.json +++ b/assets/themes/sports/license_info.json @@ -1,7 +1,7 @@ [ { "path": "sport.svg", - "license": "CC-BY", + "license": "CC-BY-4.0", "authors": [ "Tobias Zwick", "modified from EmojiOne 2: U+26BD" diff --git a/assets/themes/stations/license_info.json b/assets/themes/stations/license_info.json index afdac24d9..351dfd7b7 100644 --- a/assets/themes/stations/license_info.json +++ b/assets/themes/stations/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bench.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Matthijs Melissen" ], @@ -11,7 +11,7 @@ }, { "path": "bicycle_parking.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Matthijs Melissen" ], @@ -21,7 +21,7 @@ }, { "path": "departures_board.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Robin van der Linde" ], @@ -29,7 +29,7 @@ }, { "path": "drinking_water.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Andy Allan", "Michael Glanznig" @@ -40,7 +40,7 @@ }, { "path": "public_transport_tickets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Jérémy Ragusa" ], @@ -50,7 +50,7 @@ }, { "path": "rail-light.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Maki" ], @@ -60,7 +60,7 @@ }, { "path": "rental_bicycle.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Michael Glanznig", "Andy Allan" diff --git a/assets/themes/surveillance/license_info.json b/assets/themes/surveillance/license_info.json index 820ef2b55..53a9f3c25 100644 --- a/assets/themes/surveillance/license_info.json +++ b/assets/themes/surveillance/license_info.json @@ -1,7 +1,7 @@ [ { "path": "cam_left.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "cam_right.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -17,7 +17,7 @@ }, { "path": "dome.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -25,7 +25,7 @@ }, { "path": "logo.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json index 4885cc3ba..4f208bdf6 100644 --- a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json @@ -1,7 +1,7 @@ [ { "path": "bench.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -12,7 +12,7 @@ }, { "path": "bicycle_rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -23,7 +23,7 @@ }, { "path": "charging_station_ebike.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -34,7 +34,7 @@ }, { "path": "cycle_pump.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -45,7 +45,7 @@ }, { "path": "cycle_repair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -56,7 +56,7 @@ }, { "path": "cycle_repair_and_pump.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -67,7 +67,7 @@ }, { "path": "observation_platform.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -78,7 +78,7 @@ }, { "path": "observation_tower.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -89,7 +89,7 @@ }, { "path": "picnic_table.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -100,7 +100,7 @@ }, { "path": "playground.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -111,7 +111,7 @@ }, { "path": "toilets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -122,7 +122,7 @@ }, { "path": "toilets_wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -133,7 +133,7 @@ }, { "path": "toilets_wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], diff --git a/assets/themes/toerisme_vlaanderen/license_info.json b/assets/themes/toerisme_vlaanderen/license_info.json index 250e58d30..5e4bd3e90 100644 --- a/assets/themes/toerisme_vlaanderen/license_info.json +++ b/assets/themes/toerisme_vlaanderen/license_info.json @@ -1,7 +1,7 @@ [ { "path": "FlandersArtSans-Light.woff", - "license": "All rights reserved", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "Jo De Baerdemaeker " ], @@ -11,7 +11,7 @@ }, { "path": "FlandersArtSerif-Medium.woff", - "license": "All rights reserved", + "license": "ALL-RIGHTS-RESERVED", "authors": [ "Jo De Baerdemaeker " ], @@ -21,7 +21,7 @@ }, { "path": "avatar.png", - "license": "Logo", + "license": "LOGO", "authors": [ "Toerisme Vlaanderen" ], @@ -31,7 +31,7 @@ }, { "path": "bench.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -42,7 +42,7 @@ }, { "path": "bicycle_rental.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -53,7 +53,7 @@ }, { "path": "charging_station_ebike.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -64,7 +64,7 @@ }, { "path": "cycle_pump.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -75,7 +75,7 @@ }, { "path": "cycle_repair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -86,7 +86,7 @@ }, { "path": "cycle_repair_and_pump.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -97,7 +97,7 @@ }, { "path": "logo.png", - "license": "Logo (all rights reserved)", + "license": "LOGO-(ALL-RIGHTS-RESERVED)", "authors": [ "Toerisme Vlaanderen" ], @@ -107,7 +107,7 @@ }, { "path": "logo.svg", - "license": "Creative Commons 4.0 BY-NC", + "license": "CREATIVE-COMMONS-4.0-BY-NC", "authors": [], "sources": [ "https://pngimg.com/image/46283" @@ -115,7 +115,7 @@ }, { "path": "observation_platform.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -126,7 +126,7 @@ }, { "path": "observation_tower.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -137,7 +137,7 @@ }, { "path": "picnic_table.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -148,7 +148,7 @@ }, { "path": "pin je punt1.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -159,7 +159,7 @@ }, { "path": "pin je punt2.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -170,7 +170,7 @@ }, { "path": "pin je punt3.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -181,7 +181,7 @@ }, { "path": "pin je punt4.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -192,7 +192,7 @@ }, { "path": "pin je punt5.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -203,7 +203,7 @@ }, { "path": "pin je punt6.jpg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -214,7 +214,7 @@ }, { "path": "playground.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -225,7 +225,7 @@ }, { "path": "toilets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -236,7 +236,7 @@ }, { "path": "toilets_wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], @@ -247,7 +247,7 @@ }, { "path": "toilets_wheelchair.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Toerisme Vlaanderen" ], diff --git a/assets/themes/toilets/license_info.json b/assets/themes/toilets/license_info.json index 4a5309e37..017380070 100644 --- a/assets/themes/toilets/license_info.json +++ b/assets/themes/toilets/license_info.json @@ -1,7 +1,7 @@ [ { "path": "toilets.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Toilets-16.svg" diff --git a/assets/themes/trees/license_info.json b/assets/themes/trees/license_info.json index b31e62184..c6953fab0 100644 --- a/assets/themes/trees/license_info.json +++ b/assets/themes/trees/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "CC BY-SA 4.0", + "license": "CC-BY-SA-4.0", "authors": [ "Midgard" ], diff --git a/assets/themes/uk_addresses/license_info.json b/assets/themes/uk_addresses/license_info.json index 046bf73a3..b33649a1a 100644 --- a/assets/themes/uk_addresses/license_info.json +++ b/assets/themes/uk_addresses/license_info.json @@ -1,7 +1,7 @@ [ { "path": "housenumber_add.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -9,7 +9,7 @@ }, { "path": "housenumber_ok.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Tobias Zwick (westnordost)" ], @@ -20,7 +20,7 @@ }, { "path": "housenumber_text.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Tobias Zwick (westnordost)" ], @@ -31,7 +31,7 @@ }, { "path": "housenumber_unknown.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Tobias Zwick (westnordost)" ], @@ -42,7 +42,7 @@ }, { "path": "housenumber_unknown_small.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Pieter Vander Vennet" ], @@ -50,7 +50,7 @@ }, { "path": "stamp-outline.png", - "license": "CC0", + "license": "CC0-1.0", "authors": [ "Rob Nickerson" ], diff --git a/assets/themes/waste_basket/license_info.json b/assets/themes/waste_basket/license_info.json index 9df32672d..1a58cec51 100644 --- a/assets/themes/waste_basket/license_info.json +++ b/assets/themes/waste_basket/license_info.json @@ -1,7 +1,7 @@ [ { "path": "waste_basket.svg", - "license": "CC0", + "license": "CC0-1.0", "authors": [], "sources": [ "https://wiki.openstreetmap.org/wiki/File:Waste-basket-12.svg" diff --git a/assets/themes/width/license_info.json b/assets/themes/width/license_info.json index 638345cb8..f95a2f9b5 100644 --- a/assets/themes/width/license_info.json +++ b/assets/themes/width/license_info.json @@ -1,7 +1,7 @@ [ { "path": "icon.svg", - "license": "CC0; trivial", + "license": "CC0-1.0; TRIVIAL", "authors": [ "Pieter Vander Vennet" ], From 0d598ad0941d95ac507e47e90026f7696c9bbc43 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 03:32:49 +0200 Subject: [PATCH 024/134] More steps toward REUSE-compliance --- .reuse/dep5 | 2 +- LICENSES/AGPL-3.0-only.txt | 235 ++++++++++++++++++ LICENSES/CC-BY-2.0.txt | 81 ++++++ LICENSES/CC-BY-3.0.txt | 93 +++++++ LICENSES/CC-BY-4.0.txt | 156 ++++++++++++ LICENSES/CC-BY-NC-4.0.txt | 158 ++++++++++++ LICENSES/CC-BY-SA-2.0.txt | 85 +++++++ LICENSES/CC-BY-SA-3.0.txt | 99 ++++++++ LICENSES/CC-BY-SA-4.0.txt | 170 +++++++++++++ LICENSES/GPL-2.0-or-later.txt | 117 +++++++++ LICENSES/GPL-3.0-only.txt | 232 +++++++++++++++++ LICENSES/ISC.txt | 8 + LICENSES/LOGO.txt | 9 + LICENSES/MIT.txt | 9 + LICENSES/WTFPL.txt | 11 + .../address/housenumber_blank.svg.license | 2 + assets/layers/artwork/artwork.svg.license | 2 + assets/layers/atm/atm.svg.license | 2 + assets/layers/bank/bank.svg.license | 2 + assets/layers/barrier/barrier.svg.license | 2 + assets/layers/bench/bench.svg.license | 2 + assets/layers/bench/two_sided.svg.license | 2 + .../bicycle_library.svg.license | 2 + .../layers/bicycle_rental/rental.svg.license | 2 + .../pinIcon.svg.license | 2 + .../tube.svg.license | 2 + assets/layers/bike_cafe/bike_cafe.svg.license | 2 + .../bike_cleaning/bike_cleaning.svg.license | 2 + .../bike_cleaning_icon.svg.license | 2 + .../layers/bike_parking/bollard.svg.license | 2 + .../bike_parking/handlebar_holder.svg.license | 2 + .../layers/bike_parking/parking.svg.license | 2 + assets/layers/bike_parking/rack.svg.license | 2 + assets/layers/bike_parking/shed.svg.license | 2 + assets/layers/bike_parking/staple.svg.license | 2 + .../layers/bike_parking/two_tier.svg.license | 2 + .../bike_parking/wall_loops.svg.license | 2 + .../bike_repair_station/bike_pump.svg.license | 2 + .../broken_pump.svg.license | 2 + .../bike_repair_station/license_info.json | 2 +- .../bike_repair_station/pump.svg.license | 2 + .../pump_example.png.license | 2 + .../pump_example_manual.jpg.license | 2 + .../pump_example_round.jpg.license | 2 + .../repair_station.svg.license | 2 + .../repair_station_broken_pump.svg.license | 2 + .../repair_station_example.jpg.license | 2 + .../repair_station_example_2.jpg.license | 2 + .../repair_station_example_3.jpg.license | 2 + .../repair_station_pump.svg.license | 2 + assets/layers/bike_shop/pump.svg.license | 2 + .../layers/bike_shop/repair_shop.svg.license | 2 + assets/layers/bike_shop/shop.svg.license | 2 + assets/layers/bike_shop/tools.svg.license | 2 + .../other_services.svg.license | 2 + .../binocular/binoculars_example.jpg.license | 2 + assets/layers/binocular/license_info.json | 2 +- assets/layers/binocular/telescope.svg.license | 2 + assets/layers/birdhide/birdhide.svg.license | 2 + .../layers/birdhide/birdshelter.svg.license | 2 + assets/layers/cafe_pub/cafe.svg.license | 2 + assets/layers/cafe_pub/nightclub.svg.license | 2 + assets/layers/cafe_pub/pub.svg.license | 2 + .../layers/car_rental/car_rental.svg.license | 2 + .../charging_station/CEE7_4F.svg.license | 2 + .../Chademo_type4.svg.license | 2 + .../Tesla-hpwc-model-s.svg.license | 2 + .../charging_station/Type1-ccs.svg.license | 2 + .../charging_station/Type1_J1772.svg.license | 2 + .../charging_station/Type2_CCS.svg.license | 2 + .../charging_station/Type2_socket.svg.license | 2 + .../Type2_tethered.svg.license | 2 + .../charging_station/Type3c.svg.license | 2 + .../layers/charging_station/TypeE.svg.license | 2 + .../charging_station/bosch-3pin.svg.license | 2 + .../charging_station/bosch-5pin.svg.license | 2 + .../under_construction.svg.license | 2 + .../charging_station/usb_port.svg.license | 2 + assets/layers/clock/clock.svg.license | 2 + assets/layers/clock/clock_digital.svg.license | 2 + .../housenumber_blank.svg.license | 2 + .../180px-Trairvoja_mapeto.jpg.license | 2 + .../Belgian_road_sign_B22.svg.license | 2 + .../Belgian_road_sign_B23.svg.license | 2 + .../Vibrating_button_illustration.jpg.license | 2 + .../crossings/pedestrian_crossing.svg.license | 2 + .../crossings/traffic_lights.svg.license | 2 + .../be/Belgian_road_sign_D07.svg.license | 2 + .../be/Belgian_road_sign_D09.svg.license | 2 + .../be/Belgian_road_sign_D10.svg.license | 2 + .../be/Belgian_traffic_sign_M13.svg.license | 2 + .../be/Belgian_traffic_sign_M14.svg.license | 2 + .../be/Belgian_traffic_sign_M15.svg.license | 2 + .../be/Belgian_traffic_sign_M16.svg.license | 2 + .../be/Belgian_traffic_sign_M6.svg.license | 2 + .../be/Belgian_traffic_sign_M7.svg.license | 2 + .../Nederlands_verkeersbord_G11.svg.license | 2 + .../Nederlands_verkeersbord_G12a.svg.license | 2 + .../Nederlands_verkeersbord_G13.svg.license | 2 + .../defibrillator/defibrillator.svg.license | 2 + assets/layers/dentist/dentist.svg.license | 2 + assets/layers/doctors/doctors.svg.license | 2 + assets/layers/dogpark/dog-park.svg.license | 2 + .../layers/drinking_water/drips.svg.license | 2 + .../elevator/elevator_wheelchair.svg.license | 2 + .../entrance/emergency_door.svg.license | 2 + assets/layers/entrance/entrance.svg.license | 2 + assets/layers/etymology/logo.svg.license | 2 + assets/layers/fitness_centre/gym.svg.license | 2 + ...e_da_Alfarrobeira,_Albufeira_2.jpg.license | 2 + .../Annecy_-_rower.jpg.license | 2 + ...n_Park_beind_the_city_hall_022.jpg.license | 2 + .../Battling_ropes.jpg.license | 2 + .../Captains_chair.jpg.license | 2 + .../fitness_station/Exercise9159.jpg.license | 2 + .../fitness_station/Exercise9170.jpg.license | 2 + .../fitness_station/Exercise_Box.jpg.license | 2 + .../Fitness_station_beam_jump.jpg.license | 2 + .../Fitness_station_hurdling.jpg.license | 2 + .../Fitness_station_leapfrog.jpg.license | 2 + .../Fitness_station_slalom.jpg.license | 2 + ...Fitness_station_stepping_stone.jpg.license | 2 + .../Fitness_station_stretch_bars.jpg.license | 2 + .../Fitness_station_wall.jpg.license | 2 + .../Horizontal_ladder.jpg.license | 2 + ...it-up_and_hyperextension_bench.jpg.license | 2 + .../Inclined_sit-up_bench.jpg.license | 2 + .../Log_lifting_exercise.jpg.license | 2 + .../Outdoor_fitness_station_sign.jpg.license | 2 + .../Outdoor_stationary_bicycle.jpg.license | 2 + .../fitness_station/Push-up_bars.jpg.license | 2 + ...93268_Sports_at_a_kindergarten.jpg.license | 2 + ...cklineanlage_im_Dietenbachpark.jpg.license | 2 + ...fad_Grünwalder_Forst_Klimmzüge.jpg.license | 2 + .../fitness_station/fitness.svg.license | 2 + .../layers/food/Vegetarian-mark.svg.license | 2 + assets/layers/food/fastfood.svg.license | 2 + assets/layers/food/fries.svg.license | 2 + assets/layers/food/organic.svg.license | 2 + assets/layers/food/restaurant.svg.license | 2 + .../layers/ghost_bike/ghost_bike.svg.license | 2 + .../layers/governments/government.svg.license | 2 + assets/layers/hospital/hospital.svg.license | 2 + assets/layers/hotel/hotel.svg.license | 2 + assets/layers/hydrant/barcelona.jpg.license | 2 + assets/layers/hydrant/storz.jpg.license | 2 + assets/layers/icons/website.svg.license | 2 + assets/layers/id_presets/ID.svg.license | 2 + .../id_presets/fas-baby-carriage.svg.license | 2 + assets/layers/id_presets/fas-bath.svg.license | 2 + .../layers/id_presets/fas-blender.svg.license | 2 + assets/layers/id_presets/fas-book.svg.license | 2 + .../id_presets/fas-camera-retro.svg.license | 2 + .../id_presets/fas-cannabis.svg.license | 2 + .../id_presets/fas-car-battery.svg.license | 2 + .../layers/id_presets/fas-carrot.svg.license | 2 + assets/layers/id_presets/fas-cat.svg.license | 2 + .../layers/id_presets/fas-cheese.svg.license | 2 + .../id_presets/fas-compact-disc.svg.license | 2 + .../layers/id_presets/fas-couch.svg.license | 2 + .../layers/id_presets/fas-crutch.svg.license | 2 + assets/layers/id_presets/fas-dice.svg.license | 2 + .../layers/id_presets/fas-dolly.svg.license | 2 + .../id_presets/fas-door-open.svg.license | 2 + .../layers/id_presets/fas-dragon.svg.license | 2 + .../layers/id_presets/fas-futbol.svg.license | 2 + .../layers/id_presets/fas-guitar.svg.license | 2 + .../fas-hat-cowboy-side.svg.license | 2 + assets/layers/id_presets/fas-key.svg.license | 2 + .../layers/id_presets/fas-laptop.svg.license | 2 + assets/layers/id_presets/fas-leaf.svg.license | 2 + .../id_presets/fas-microchip.svg.license | 2 + .../id_presets/fas-motorcycle.svg.license | 2 + .../id_presets/fas-newspaper.svg.license | 2 + .../id_presets/fas-paint-roller.svg.license | 2 + .../id_presets/fas-paperclip.svg.license | 2 + .../layers/id_presets/fas-pills.svg.license | 2 + assets/layers/id_presets/fas-plug.svg.license | 2 + .../layers/id_presets/fas-print.svg.license | 2 + .../layers/id_presets/fas-rocket.svg.license | 2 + .../layers/id_presets/fas-store.svg.license | 2 + .../fas-suitcase-rolling.svg.license | 2 + .../id_presets/fas-suitcase.svg.license | 2 + assets/layers/id_presets/fas-tape.svg.license | 2 + .../layers/id_presets/fas-tractor.svg.license | 2 + .../layers/id_presets/fas-trophy.svg.license | 2 + .../id_presets/fas-vector-square.svg.license | 2 + .../id_presets/fas-wine-bottle.svg.license | 2 + .../id_presets/maki-alcohol-shop.svg.license | 2 + .../layers/id_presets/maki-bakery.svg.license | 2 + .../id_presets/maki-bicycle.svg.license | 2 + .../id_presets/maki-car-repair.svg.license | 2 + assets/layers/id_presets/maki-car.svg.license | 2 + .../id_presets/maki-cemetery.svg.license | 2 + .../maki-clothing-store.svg.license | 2 + .../id_presets/maki-confectionery.svg.license | 2 + .../id_presets/maki-florist.svg.license | 2 + .../layers/id_presets/maki-gaming.svg.license | 2 + .../id_presets/maki-garden-centre.svg.license | 2 + .../layers/id_presets/maki-gift.svg.license | 2 + .../id_presets/maki-grocery.svg.license | 2 + .../id_presets/maki-jewelry-store.svg.license | 2 + .../id_presets/maki-lodging.svg.license | 2 + .../id_presets/maki-optician.svg.license | 2 + .../layers/id_presets/maki-shoe.svg.license | 2 + .../layers/id_presets/maki-shop.svg.license | 2 + .../id_presets/maki-teahouse.svg.license | 2 + .../id_presets/maki-telephone.svg.license | 2 + .../id_presets/maki-warehouse.svg.license | 2 + .../layers/id_presets/maki-watch.svg.license | 2 + .../id_presets/temaki-balloon.svg.license | 2 + .../temaki-beauty_salon.svg.license | 2 + .../layers/id_presets/temaki-boat.svg.license | 2 + .../id_presets/temaki-bottles.svg.license | 2 + .../temaki-bow_and_arrow.svg.license | 2 + .../temaki-camper_trailer.svg.license | 2 + .../id_presets/temaki-cleaver.svg.license | 2 + .../id_presets/temaki-cloth.svg.license | 2 + .../temaki-clothes_hanger.svg.license | 2 + .../id_presets/temaki-coffee.svg.license | 2 + .../id_presets/temaki-compass.svg.license | 2 + .../id_presets/temaki-curtains.svg.license | 2 + .../id_presets/temaki-dagger.svg.license | 2 + .../id_presets/temaki-desk_lamp.svg.license | 2 + .../temaki-fashion_accessories.svg.license | 2 + .../id_presets/temaki-fireplace.svg.license | 2 + .../temaki-fish_cleaning.svg.license | 2 + .../id_presets/temaki-furniture.svg.license | 2 + .../id_presets/temaki-hair_care.svg.license | 2 + .../id_presets/temaki-hammer_shoe.svg.license | 2 + .../id_presets/temaki-handbag.svg.license | 2 + .../id_presets/temaki-hearing_aid.svg.license | 2 + .../id_presets/temaki-ice_fishing.svg.license | 2 + .../temaki-kitchen_sink.svg.license | 2 + .../id_presets/temaki-laundry.svg.license | 2 + .../id_presets/temaki-lipstick.svg.license | 2 + .../layers/id_presets/temaki-meat.svg.license | 2 + .../id_presets/temaki-military.svg.license | 2 + .../id_presets/temaki-money_hand.svg.license | 2 + .../temaki-motorcycle_repair.svg.license | 2 + .../temaki-movie_rental.svg.license | 2 + .../temaki-needle_and_spool.svg.license | 2 + .../id_presets/temaki-perfume.svg.license | 2 + .../temaki-pet_grooming.svg.license | 2 + .../layers/id_presets/temaki-pipe.svg.license | 2 + .../id_presets/temaki-power.svg.license | 2 + .../temaki-propane_tank.svg.license | 2 + .../id_presets/temaki-psychic.svg.license | 2 + .../temaki-rocket_firework.svg.license | 2 + .../temaki-scuba_diving.svg.license | 2 + .../layers/id_presets/temaki-spa.svg.license | 2 + .../id_presets/temaki-speaker.svg.license | 2 + .../temaki-spice_bottle.svg.license | 2 + .../temaki-storage_fermenter.svg.license | 2 + .../temaki-storage_rental.svg.license | 2 + .../temaki-tattoo_machine.svg.license | 2 + .../id_presets/temaki-tiling.svg.license | 2 + .../layers/id_presets/temaki-tire.svg.license | 2 + .../id_presets/temaki-tools.svg.license | 2 + .../id_presets/temaki-vacuum.svg.license | 2 + .../layers/id_presets/temaki-vase.svg.license | 2 + .../temaki-water_bottle.svg.license | 2 + .../id_presets/temaki-window.svg.license | 2 + assets/layers/indoors/license_info.json | 44 ++-- .../indoors/room_administration.svg.license | 2 + .../indoors/room_auditorium.svg.license | 2 + .../layers/indoors/room_bedroom.svg.license | 2 + assets/layers/indoors/room_chapel.svg.license | 2 + assets/layers/indoors/room_class.svg.license | 2 + .../layers/indoors/room_computer.svg.license | 2 + .../indoors/room_conference.svg.license | 2 + assets/layers/indoors/room_crypt.svg.license | 2 + .../layers/indoors/room_kitchen.svg.license | 2 + .../indoors/room_laboratory.svg.license | 2 + .../layers/indoors/room_library.svg.license | 2 + assets/layers/indoors/room_locker.svg.license | 2 + .../layers/indoors/room_nursery.svg.license | 2 + assets/layers/indoors/room_office.svg.license | 2 + .../indoors/room_prison_cell.svg.license | 2 + .../indoors/room_restaurant.svg.license | 2 + .../indoors/room_security_check.svg.license | 2 + assets/layers/indoors/room_sport.svg.license | 2 + .../layers/indoors/room_storage.svg.license | 2 + .../layers/indoors/room_technical.svg.license | 2 + .../layers/indoors/room_toilets.svg.license | 2 + .../layers/indoors/room_waiting.svg.license | 2 + .../information_board/board.svg.license | 2 + assets/layers/kerbs/KerbIcon.svg.license | 2 + assets/layers/kerbs/flush.svg.license | 2 + assets/layers/kerbs/lowered.svg.license | 2 + assets/layers/kerbs/no.svg.license | 2 + assets/layers/kerbs/raised.svg.license | 2 + .../childcare.svg.license | 2 + .../kindergarten.svg.license | 2 + assets/layers/map/map-stickered.svg.license | 2 + assets/layers/map/map.svg.license | 2 + .../map/osm-logo-buggy-attr.svg.license | 2 + .../layers/map/osm-logo-white-bg.svg.license | 2 + .../layers/maproulette/logomark.svg.license | 2 + .../maxspeed/living_street_be.svg.license | 2 + assets/layers/memorial/plaque.svg.license | 2 + assets/layers/nature_reserve/ANB.jpg.license | 2 + .../nature_reserve/Natuurpunt.jpg.license | 2 + .../nature_reserve/groen_logo.svg.license | 2 + .../nature_reserve/nature_reserve.svg.license | 2 + .../Tower_observation.svg.license | 2 + .../osm_community_index/license_info.json | 2 +- .../osm_community_index/osm.svg.license | 2 + .../parcel_lockers/parcel_lockers.svg.license | 2 + assets/layers/parking/parking.svg.license | 2 + .../parking_spaces/parking_space.svg.license | 2 + .../parking_tickets.svg.license | 2 + assets/layers/pharmacy/pharmacy.svg.license | 2 + .../physiotherapist/doctors.svg.license | 2 + .../picnic_table/picnic_table.svg.license | 2 + assets/layers/play_forest/icon.svg.license | 2 + assets/layers/postboxes/postbox.svg.license | 2 + .../postoffices/post_office.svg.license | 2 + assets/layers/questions/100euro.svg.license | 2 + assets/layers/questions/10cent.svg.license | 2 + assets/layers/questions/10euro.svg.license | 2 + assets/layers/questions/1cent.svg.license | 2 + assets/layers/questions/1euro.svg.license | 2 + assets/layers/questions/200euro.svg.license | 2 + assets/layers/questions/20cent.svg.license | 2 + assets/layers/questions/20euro.svg.license | 2 + assets/layers/questions/2cent.svg.license | 2 + assets/layers/questions/2euro.svg.license | 2 + assets/layers/questions/500euro.svg.license | 2 + assets/layers/questions/50cent.svg.license | 2 + assets/layers/questions/50euro.svg.license | 2 + assets/layers/questions/5cent.svg.license | 2 + assets/layers/questions/5euro.svg.license | 2 + .../audio_induction_loop.svg.license | 2 + .../audio_induction_loop_missing.svg.license | 2 + assets/layers/questions/cash.svg.license | 2 + assets/layers/questions/coins.svg.license | 2 + assets/layers/questions/nfc_card.svg.license | 2 + .../layers/questions/no_smoking.svg.license | 2 + assets/layers/questions/notes.svg.license | 2 + .../layers/questions/payment_card.svg.license | 2 + assets/layers/questions/phone.svg.license | 2 + assets/layers/questions/qrcode.svg.license | 2 + .../layers/questions/send_email.svg.license | 2 + .../layers/questions/smartphone.svg.license | 2 + assets/layers/questions/smoking.svg.license | 2 + .../reception_desk/reception_desk.svg.license | 2 + assets/layers/recycling/batteries.svg.license | 2 + .../recycling/beverage_cartons.svg.license | 2 + assets/layers/recycling/bicycles.svg.license | 2 + assets/layers/recycling/cans.svg.license | 2 + assets/layers/recycling/clothes.svg.license | 2 + .../layers/recycling/cooking_oil.svg.license | 2 + .../layers/recycling/engine_oil.svg.license | 2 + .../recycling/fluorescent_tubes.svg.license | 2 + .../layers/recycling/garden_waste.svg.license | 2 + assets/layers/recycling/glass.svg.license | 2 + .../recycling/glass_bottles.svg.license | 2 + .../layers/recycling/light_bulbs.svg.license | 2 + assets/layers/recycling/needles.svg.license | 2 + assets/layers/recycling/newspaper.svg.license | 2 + assets/layers/recycling/paper.svg.license | 2 + assets/layers/recycling/plastic.svg.license | 2 + .../recycling/plastic_bottles.svg.license | 2 + .../recycling/plastic_packaging.svg.license | 2 + .../recycling/printer_cartridges.svg.license | 2 + .../layers/recycling/recycling-14.svg.license | 2 + .../layers/recycling/scrap_metal.svg.license | 2 + assets/layers/recycling/shoes.svg.license | 2 + .../small_electrical_appliances.svg.license | 2 + assets/layers/school/college.svg.license | 2 + assets/layers/school/school.svg.license | 2 + assets/layers/shelter/shelter.svg.license | 2 + assets/layers/shops/shop-disused.svg.license | 2 + assets/layers/shower/shower.svg.license | 2 + .../layers/slow_roads/slow_road.svg.license | 2 + assets/layers/slow_roads/woonerf.svg.license | 2 + .../speed_camera/speed_camera.svg.license | 2 + .../speed_display/speed_display.svg.license | 2 + .../layers/sport_pitch/baseball.svg.license | 2 + .../layers/sport_pitch/basketball.svg.license | 2 + .../sport_pitch/beachvolleyball.svg.license | 2 + assets/layers/sport_pitch/boules.svg.license | 2 + .../layers/sport_pitch/equestrian.svg.license | 2 + assets/layers/sport_pitch/lock.svg.license | 2 + .../layers/sport_pitch/skateboard.svg.license | 2 + assets/layers/sport_pitch/soccer.svg.license | 2 + .../sport_pitch/sport_pitch.svg.license | 2 + .../sport_pitch/table_tennis.svg.license | 2 + assets/layers/sport_pitch/tennis.svg.license | 2 + .../layers/sport_pitch/volleyball.svg.license | 2 + .../sports_centre/sports_centre.svg.license | 2 + .../layers/stairs/Braille_stairs.jpg.license | 2 + .../street_lamps/bent_pole_1.svg.license | 2 + .../street_lamps/bent_pole_2.svg.license | 2 + .../street_lamps/straight_pole.svg.license | 2 + .../street_lamps/street_lamp.svg.license | 2 + assets/layers/toilet/toilets.svg.license | 2 + assets/layers/toilet/urinal.svg.license | 2 + assets/layers/toilet/wheelchair.svg.license | 2 + assets/layers/trail/pushchair.svg.license | 2 + assets/layers/trail/trail.svg.license | 2 + assets/layers/trail/wheelchair.svg.license | 2 + .../layers/transit_stops/bus_stop.svg.license | 2 + ...rend_Erfgoed_logo_without_text.svg.license | 2 + .../layers/tree_node/broadleaved.svg.license | 2 + assets/layers/tree_node/leafless.svg.license | 2 + .../layers/tree_node/needleleaved.svg.license | 2 + assets/layers/tree_node/unknown.svg.license | 2 + .../translate_disabled.svg.license | 2 + .../usersettings/translate_mobile.svg.license | 2 + assets/layers/vending_machine/cow.svg.license | 2 + assets/layers/vending_machine/egg.svg.license | 2 + .../layers/vending_machine/honey.svg.license | 2 + .../vending_machine/mug-saucer.svg.license | 2 + .../layers/vending_machine/potato.svg.license | 2 + .../vending_machine/smoking.svg.license | 2 + .../vending_machine/utensils.svg.license | 2 + .../vending_machine.svg.license | 2 + assets/layers/veterinary/vet.svg.license | 2 + assets/layers/viewpoint/viewpoint.svg.license | 2 + .../information.svg.license | 2 + .../walls_and_buildings.png.license | 2 + .../waste_disposal/waste_disposal.svg.license | 2 + assets/svg/SocialImageForeground.svg.license | 2 + assets/svg/add.svg.license | 2 + assets/svg/addSmall.svg.license | 2 + assets/svg/add_pin.svg.license | 2 + assets/svg/back.svg.license | 2 + assets/svg/blocked.svg.license | 2 + assets/svg/brick_wall_raw.svg.license | 2 + assets/svg/brick_wall_round.svg.license | 2 + assets/svg/brick_wall_square.svg.license | 2 + assets/svg/bug.svg.license | 2 + assets/svg/camera-plus.svg.license | 2 + assets/svg/checkmark.svg.license | 2 + assets/svg/circle.svg.license | 2 + assets/svg/clock.svg.license | 2 + assets/svg/close.svg.license | 2 + assets/svg/community.svg.license | 2 + assets/svg/compass.svg.license | 2 + assets/svg/confirm.svg.license | 2 + assets/svg/copyright.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/delete_icon.svg.license | 2 + assets/svg/delete_not_allowed.svg.license | 2 + assets/svg/direction_gradient.svg.license | 2 + assets/svg/direction_stroke.svg.license | 2 + assets/svg/download.svg.license | 2 + assets/svg/duplicate.svg.license | 2 + assets/svg/elevator.svg.license | 2 + assets/svg/elevator_wheelchair.svg.license | 2 + assets/svg/envelope.svg.license | 2 + assets/svg/eye.svg.license | 2 + assets/svg/filter.svg.license | 2 + assets/svg/filter_disable.svg.license | 2 + assets/svg/floppy.svg.license | 2 + assets/svg/gear.svg.license | 2 + assets/svg/gender_bi.svg.license | 2 + assets/svg/gender_female.svg.license | 2 + assets/svg/gender_inter.svg.license | 2 + assets/svg/gender_male.svg.license | 2 + assets/svg/gender_queer.svg.license | 2 + assets/svg/gender_trans.svg.license | 2 + assets/svg/generic_map.svg.license | 2 + assets/svg/gps_arrow.svg.license | 2 + assets/svg/hand.svg.license | 2 + assets/svg/help.svg.license | 2 + assets/svg/home.svg.license | 2 + assets/svg/invalid.svg.license | 2 + assets/svg/josm_logo.svg.license | 2 + assets/svg/layers.svg.license | 2 + assets/svg/length-crosshair.svg.license | 2 + assets/svg/liberapay.svg.license | 2 + assets/svg/license_info.json | 6 +- assets/svg/loading.svg.license | 2 + assets/svg/location-empty.svg.license | 2 + assets/svg/location-refused.svg.license | 2 + assets/svg/location.svg.license | 2 + assets/svg/location_locked.svg.license | 2 + assets/svg/location_unlocked.svg.license | 2 + assets/svg/login.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/move-arrows.svg.license | 2 + assets/svg/move.svg.license | 2 + assets/svg/move_confirm.svg.license | 2 + assets/svg/move_not_allowed.svg.license | 2 + assets/svg/no_checkmark.svg.license | 2 + assets/svg/none.svg.license | 2 + assets/svg/not_found.svg.license | 2 + assets/svg/note.svg.license | 2 + assets/svg/osm-logo-us.svg.license | 2 + assets/svg/osm-logo.svg.license | 2 + assets/svg/party.svg.license | 2 + assets/svg/pencil.svg.license | 2 + assets/svg/person.svg.license | 2 + assets/svg/pin.svg.license | 2 + assets/svg/plantnet_logo.svg.license | 2 + assets/svg/plus.svg.license | 2 + assets/svg/pop-out.svg.license | 2 + assets/svg/reload.svg.license | 2 + assets/svg/relocation.svg.license | 2 + assets/svg/resolved.svg.license | 2 + assets/svg/ring.svg.license | 2 + assets/svg/robot.svg.license | 2 + assets/svg/satellite.svg.license | 2 + assets/svg/scissors.svg.license | 2 + assets/svg/search.svg.license | 2 + assets/svg/search_disable.svg.license | 2 + assets/svg/share.svg.license | 2 + assets/svg/speech_bubble.svg.license | 2 + .../speech_bubble_black_outline.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/statistics.svg.license | 2 + assets/svg/teardrop.svg.license | 2 + .../svg/teardrop_with_hole_green.svg.license | 2 + assets/svg/translate.svg.license | 2 + assets/svg/triangle.svg.license | 2 + assets/svg/up.svg.license | 2 + assets/svg/upload.svg.license | 2 + assets/svg/wikidata.svg.license | 2 + .../svg/wikimedia-commons-white.svg.license | 2 + assets/svg/wikipedia.svg.license | 2 + .../AdvertisingColumn_001.jpg.license | 2 + .../AdvertisingColumn_003.jpg.license | 2 + .../AdvertisingTotem_003.jpg.license | 2 + .../AdvertisingTotem_004.jpg.license | 2 + .../advertising/Advertising_flag.jpg.license | 2 + .../Aircraft_Sculpture.jpg.license | 2 + assets/themes/advertising/BS.JPG.license | 2 + .../advertising/Capitol_wall.jpg.license | 2 + .../advertising/City-Light-Poster.jpg.license | 2 + .../advertising/FGV_Founding.jpg.license | 2 + .../themes/advertising/JR_Central.jpg.license | 2 + .../advertising/KFC_Billboard.jpg.license | 2 + .../advertising/LIDL_Billboard.jpg.license | 2 + .../themes/advertising/Lidl_totem.jpg.license | 2 + assets/themes/advertising/Mug.jpg.license | 2 + .../themes/advertising/Mupi_Alcoi.jpg.license | 2 + .../themes/advertising/Mupi_spain.jpg.license | 2 + .../advertising/Repsol_Billboard.jpg.license | 2 + .../advertising/Screen_poster_box.jpg.license | 2 + .../advertising/Small_Board.jpg.license | 2 + .../advertising/Subway_screen.jpg.license | 2 + .../themes/advertising/TV_media.jpg.license | 2 + .../advertising/Times square.jpg.license | 2 + .../advertising/Waitrose_sign.jpg.license | 2 + .../themes/advertising/billboard.svg.license | 2 + assets/themes/advertising/board.svg.license | 2 + .../advertising/clarke_wall.jpg.license | 2 + assets/themes/advertising/column.svg.license | 2 + .../themes/advertising/farma_sign.jpg.license | 2 + assets/themes/advertising/flag.svg.license | 2 + assets/themes/advertising/icon.svg.license | 2 + .../advertising/local_Board.jpg.license | 2 + .../advertising/newspaper_kiosk.svg.license | 2 + .../themes/advertising/poster_box.svg.license | 2 + .../poster_box_no_support.svg.license | 2 + .../advertising/screen alcoi.jpg.license | 2 + assets/themes/advertising/screen.svg.license | 2 + .../advertising/screen_no_support.svg.license | 2 + .../themes/advertising/sculpture.svg.license | 2 + assets/themes/advertising/sign.svg.license | 2 + .../themes/advertising/sign_EOI.jpg.license | 2 + assets/themes/advertising/tarp.svg.license | 2 + .../themes/advertising/tarp_feder.jpg.license | 2 + .../advertising/tarp_madrid.jpg.license | 2 + assets/themes/advertising/totem.svg.license | 2 + .../themes/advertising/trivision.svg.license | 2 + .../advertising/wall_painting.svg.license | 2 + assets/themes/aed/aed.svg.license | 2 + assets/themes/artwork/artwork.svg.license | 2 + assets/themes/atm/logo.svg.license | 2 + assets/themes/bag/logo.svg.license | 2 + assets/themes/benches/bench_poi.svg.license | 2 + .../bench_public_transport.svg.license | 2 + assets/themes/bicycle_rental/logo.svg.license | 2 + .../themes/bicycle_rental/rental.svg.license | 2 + assets/themes/bicyclelib/logo.svg.license | 2 + assets/themes/blind_osm/Blindicon.svg.license | 2 + assets/themes/bookcases/bookcase.svg.license | 2 + assets/themes/buurtnatuur/ANB.jpg.license | 2 + .../themes/buurtnatuur/Natuurpunt.jpg.license | 2 + assets/themes/buurtnatuur/forest.svg.license | 2 + .../themes/buurtnatuur/groen_logo.svg.license | 2 + assets/themes/buurtnatuur/logo.svg.license | 2 + .../buurtnatuur/nature_reserve.svg.license | 2 + assets/themes/buurtnatuur/park.svg.license | 2 + .../buurtnatuur/social_image.jpg.license | 2 + assets/themes/campersite/caravan.svg.license | 2 + .../campersite/caravan_green.svg.license | 2 + .../sanitary_dump_station.svg.license | 2 + .../campersite/social_image.jpg.license | 2 + .../charging_stations/bicycle.svg.license | 2 + .../themes/charging_stations/car.svg.license | 2 + .../themes/charging_stations/logo.svg.license | 2 + .../themes/charging_stations/plug.svg.license | 2 + assets/themes/climbing/carabiner.svg.license | 2 + .../themes/climbing/climbing_gym.svg.license | 2 + .../themes/climbing/climbing_icon.svg.license | 2 + .../climbing/climbing_no_rope.svg.license | 2 + .../themes/climbing/climbing_rope.svg.license | 2 + .../climbing/climbing_route.svg.license | 2 + .../climbing/climbing_unknown.svg.license | 2 + assets/themes/climbing/club.svg.license | 2 + assets/themes/climbing/height.svg.license | 2 + .../fietssnelwegen-logo.svg.license | 2 + .../Cycle_barrier_double.svg.license | 2 + .../Cycle_barrier_double_length.png.license | 2 + .../Cycle_barrier_double_length.svg.license | 2 + .../Cycle_barrier_double_overlap.svg.license | 2 + .../Cycle_barrier_double_template.svg.license | 2 + .../Cycle_barrier_double_width.svg.license | 2 + .../Cycle_barrier_single.png.license | 2 + .../Cycle_barrier_squeeze.png.license | 2 + .../Cycle_barrier_triple.png.license | 2 + .../themes/cycle_infra/bicycleway.svg.license | 2 + .../cycle_infra/cycle-infra.svg.license | 2 + assets/themes/cycle_infra/street.svg.license | 2 + assets/themes/cyclenodes/license_info.json | 2 +- assets/themes/cyclenodes/logo.svg.license | 2 + assets/themes/cyclestreets/F111.svg.license | 2 + assets/themes/cyclestreets/F113.svg.license | 2 + .../Finland_road_sign_E28.svg.license | 2 + .../Finland_road_sign_E29.svg.license | 2 + .../cyclestreets/Zeichen_244.svg.license | 2 + .../Zeichen_244_1020-30.svg.license | 2 + .../Zeichen_244_1022-12.svg.license | 2 + .../Zeichen_244_1024-10.svg.license | 2 + .../Zeichen_244_KFZ_frei.svg.license | 2 + .../cyclestreets/Zeichen_244a.svg.license | 2 + assets/themes/cyclestreets/logo.svg.license | 2 + .../fietsambassade_gent_logo.svg.license | 2 + ...fietsambassade_gent_logo_small.svg.license | 2 + assets/themes/cyclofix/key.svg.license | 2 + assets/themes/cyclofix/logo.svg.license | 2 + assets/themes/drinking_water/logo.svg.license | 2 + .../themes/elongated_coin/penny.svg.license | 2 + assets/themes/facadegardens/bloei.svg.license | 2 + .../facadegardens/bodembedekker.svg.license | 2 + .../themes/facadegardens/eetbaar.svg.license | 2 + .../themes/facadegardens/gevelton.svg.license | 2 + .../facadegardens/geveltuin.svg.license | 2 + .../themes/facadegardens/halfzon.svg.license | 2 + .../facadegardens/klimplant.svg.license | 2 + .../themes/facadegardens/schaduw.svg.license | 2 + .../themes/facadegardens/struik.svg.license | 2 + assets/themes/facadegardens/zon.svg.license | 2 + assets/themes/fritures/fries.svg.license | 2 + assets/themes/fritures/logo.svg.license | 2 + .../themes/fruit_trees/fruit_tree.svg.license | 2 + assets/themes/ghostbikes/logo.svg.license | 2 + .../themes/grb/housenumber_blank.svg.license | 2 + assets/themes/grb/logo.svg.license | 2 + assets/themes/grb/warning.svg.license | 2 + assets/themes/hackerspaces/glider.svg.license | 2 + assets/themes/hackerspaces/led.png.license | 2 + .../hailhydrant/Twemoji12_1f692.svg.license | 2 + .../hailhydrant/Twemoji12_1f9ef.svg.license | 2 + .../hailhydrant/Twemoji12_26d1.svg.license | 2 + .../hailhydrant/Twemoji_1f691.svg.license | 2 + assets/themes/hailhydrant/hydrant.svg.license | 2 + .../hailhydrant/hydrant_pillar.svg.license | 2 + .../hydrant_underground.svg.license | 2 + .../hailhydrant/hydrant_unknown.svg.license | 2 + assets/themes/hailhydrant/license_info.json | 2 +- assets/themes/hailhydrant/logo.svg.license | 2 + assets/themes/maps/logo.svg.license | 2 + .../maxspeed/maxspeed_10 mph.svg.license | 2 + .../maxspeed/maxspeed_100 mph.svg.license | 2 + .../maxspeed/maxspeed_110 mph.svg.license | 2 + .../maxspeed/maxspeed_120 mph.svg.license | 2 + .../maxspeed/maxspeed_130 mph.svg.license | 2 + .../maxspeed/maxspeed_140 mph.svg.license | 2 + .../maxspeed/maxspeed_20 mph.svg.license | 2 + .../maxspeed/maxspeed_30 mph.svg.license | 2 + .../maxspeed/maxspeed_40 mph.svg.license | 2 + .../maxspeed/maxspeed_50 mph.svg.license | 2 + .../maxspeed/maxspeed_60 mph.svg.license | 2 + .../maxspeed/maxspeed_70 mph.svg.license | 2 + .../maxspeed/maxspeed_80 mph.svg.license | 2 + .../maxspeed/maxspeed_90 mph.svg.license | 2 + .../themes/maxspeed/maxspeed_logo.svg.license | 2 + assets/themes/nature/logo.svg.license | 2 + assets/themes/notes/logo.svg.license | 2 + .../themes/onwheels/bicycle_pump.svg.license | 2 + assets/themes/onwheels/cafe.svg.license | 2 + assets/themes/onwheels/cone.svg.license | 2 + assets/themes/onwheels/crest.svg.license | 2 + assets/themes/onwheels/doctor.svg.license | 2 + assets/themes/onwheels/elevator.svg.license | 2 + assets/themes/onwheels/entrance.svg.license | 2 + assets/themes/onwheels/government.svg.license | 2 + assets/themes/onwheels/hospital.svg.license | 2 + assets/themes/onwheels/hotel.svg.license | 2 + assets/themes/onwheels/parking.svg.license | 2 + assets/themes/onwheels/pharmacy.svg.license | 2 + assets/themes/onwheels/repair.svg.license | 2 + assets/themes/onwheels/restaurant.svg.license | 2 + assets/themes/onwheels/shop.svg.license | 2 + assets/themes/onwheels/toilet.svg.license | 2 + .../themes/openwindpowermap/logo.svg.license | 2 + .../openwindpowermap/wind_turbine.svg.license | 2 + .../osm_community_index/license_info.json | 2 +- .../osm_community_index/osm.svg.license | 2 + assets/themes/parkings/parkings.svg.license | 2 + assets/themes/pets/dog-food.svg.license | 2 + assets/themes/pets/dogshop.svg.license | 2 + assets/themes/pets/petshop.svg.license | 2 + .../themes/playgrounds/playground.svg.license | 2 + .../themes/postal_codes/townhall.svg.license | 2 + .../rainbow_crossings/crossing.svg.license | 2 + .../themes/rainbow_crossings/logo.svg.license | 2 + assets/themes/shops/shop.svg.license | 2 + ...epartement_Omgeving_Vlaanderen.png.license | 2 + assets/themes/speelplekken/logo.svg.license | 2 + .../provincie_antwerpen.jpg.license | 2 + .../speelplekken/social_image.jpg.license | 2 + .../themes/speelplekken/speelbos.svg.license | 2 + .../themes/speelplekken/speeltuin.svg.license | 2 + .../speelplekken/speelweide.svg.license | 2 + .../themes/speelplekken/youtube.svg.license | 2 + assets/themes/sports/sport.svg.license | 2 + assets/themes/stations/bench.svg.license | 2 + .../stations/bicycle_parking.svg.license | 2 + .../stations/departures_board.svg.license | 2 + .../stations/drinking_water.svg.license | 2 + .../public_transport_tickets.svg.license | 2 + assets/themes/stations/rail-light.svg.license | 2 + .../stations/rental_bicycle.svg.license | 2 + .../themes/surveillance/cam_left.svg.license | 2 + .../themes/surveillance/cam_right.svg.license | 2 + assets/themes/surveillance/dome.svg.license | 2 + assets/themes/surveillance/logo.svg.license | 2 + .../FlandersArtSans-Light.woff.license | 2 + .../FlandersArtSerif-Medium.woff.license | 2 + .../NEGATIEF/bench.svg.license | 2 + .../NEGATIEF/bicycle_rental.svg.license | 2 + .../charging_station_ebike.svg.license | 2 + .../NEGATIEF/cycle_pump.svg.license | 2 + .../NEGATIEF/cycle_repair.svg.license | 2 + .../cycle_repair_and_pump.svg.license | 2 + .../NEGATIEF/observation_platform.svg.license | 2 + .../NEGATIEF/observation_tower.svg.license | 2 + .../NEGATIEF/picnic_table.svg.license | 2 + .../NEGATIEF/playground.svg.license | 2 + .../NEGATIEF/toilets.svg.license | 2 + .../NEGATIEF/toilets_wheelchair.svg.license | 2 + .../toerisme_vlaanderen/avatar.png.license | 2 + .../toerisme_vlaanderen/bench.svg.license | 2 + .../bicycle_rental.svg.license | 2 + .../charging_station_ebike.svg.license | 2 + .../cycle_pump.svg.license | 2 + .../cycle_repair.svg.license | 2 + .../cycle_repair_and_pump.svg.license | 2 + .../toerisme_vlaanderen/license_info.json | 2 +- .../toerisme_vlaanderen/logo.png.license | 2 + .../toerisme_vlaanderen/logo.svg.license | 2 + .../observation_platform.svg.license | 2 + .../observation_tower.svg.license | 2 + .../picnic_table.svg.license | 2 + .../pin je punt1.jpg.license | 2 + .../pin je punt2.jpg.license | 2 + .../pin je punt3.jpg.license | 2 + .../pin je punt4.jpg.license | 2 + .../pin je punt5.jpg.license | 2 + .../pin je punt6.jpg.license | 2 + .../playground.svg.license | 2 + .../toerisme_vlaanderen/toilets.svg.license | 2 + .../toilets_wheelchair.svg.license | 2 + assets/themes/toilets/toilets.svg.license | 2 + assets/themes/trees/logo.svg.license | 2 + .../uk_addresses/housenumber_add.svg.license | 2 + .../uk_addresses/housenumber_ok.svg.license | 2 + .../uk_addresses/housenumber_text.svg.license | 2 + .../housenumber_unknown.svg.license | 2 + .../housenumber_unknown_small.svg.license | 2 + .../uk_addresses/stamp-outline.png.license | 2 + .../waste_basket/waste_basket.svg.license | 2 + assets/themes/width/icon.svg.license | 2 + generated.license_info.json | 58 ----- package.json | 2 +- scripts/generateLicenseInfo.ts | 49 ++++ 795 files changed, 3082 insertions(+), 92 deletions(-) create mode 100644 LICENSES/AGPL-3.0-only.txt create mode 100644 LICENSES/CC-BY-2.0.txt create mode 100644 LICENSES/CC-BY-3.0.txt create mode 100644 LICENSES/CC-BY-4.0.txt create mode 100644 LICENSES/CC-BY-NC-4.0.txt create mode 100644 LICENSES/CC-BY-SA-2.0.txt create mode 100644 LICENSES/CC-BY-SA-3.0.txt create mode 100644 LICENSES/CC-BY-SA-4.0.txt create mode 100644 LICENSES/GPL-2.0-or-later.txt create mode 100644 LICENSES/GPL-3.0-only.txt create mode 100644 LICENSES/ISC.txt create mode 100644 LICENSES/LOGO.txt create mode 100644 LICENSES/MIT.txt create mode 100644 LICENSES/WTFPL.txt create mode 100644 assets/layers/address/housenumber_blank.svg.license create mode 100644 assets/layers/artwork/artwork.svg.license create mode 100644 assets/layers/atm/atm.svg.license create mode 100644 assets/layers/bank/bank.svg.license create mode 100644 assets/layers/barrier/barrier.svg.license create mode 100644 assets/layers/bench/bench.svg.license create mode 100644 assets/layers/bench/two_sided.svg.license create mode 100644 assets/layers/bicycle_library/bicycle_library.svg.license create mode 100644 assets/layers/bicycle_rental/rental.svg.license create mode 100644 assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license create mode 100644 assets/layers/bicycle_tube_vending_machine/tube.svg.license create mode 100644 assets/layers/bike_cafe/bike_cafe.svg.license create mode 100644 assets/layers/bike_cleaning/bike_cleaning.svg.license create mode 100644 assets/layers/bike_cleaning/bike_cleaning_icon.svg.license create mode 100644 assets/layers/bike_parking/bollard.svg.license create mode 100644 assets/layers/bike_parking/handlebar_holder.svg.license create mode 100644 assets/layers/bike_parking/parking.svg.license create mode 100644 assets/layers/bike_parking/rack.svg.license create mode 100644 assets/layers/bike_parking/shed.svg.license create mode 100644 assets/layers/bike_parking/staple.svg.license create mode 100644 assets/layers/bike_parking/two_tier.svg.license create mode 100644 assets/layers/bike_parking/wall_loops.svg.license create mode 100644 assets/layers/bike_repair_station/bike_pump.svg.license create mode 100644 assets/layers/bike_repair_station/broken_pump.svg.license create mode 100644 assets/layers/bike_repair_station/pump.svg.license create mode 100644 assets/layers/bike_repair_station/pump_example.png.license create mode 100644 assets/layers/bike_repair_station/pump_example_manual.jpg.license create mode 100644 assets/layers/bike_repair_station/pump_example_round.jpg.license create mode 100644 assets/layers/bike_repair_station/repair_station.svg.license create mode 100644 assets/layers/bike_repair_station/repair_station_broken_pump.svg.license create mode 100644 assets/layers/bike_repair_station/repair_station_example.jpg.license create mode 100644 assets/layers/bike_repair_station/repair_station_example_2.jpg.license create mode 100644 assets/layers/bike_repair_station/repair_station_example_3.jpg.license create mode 100644 assets/layers/bike_repair_station/repair_station_pump.svg.license create mode 100644 assets/layers/bike_shop/pump.svg.license create mode 100644 assets/layers/bike_shop/repair_shop.svg.license create mode 100644 assets/layers/bike_shop/shop.svg.license create mode 100644 assets/layers/bike_shop/tools.svg.license create mode 100644 assets/layers/bike_themed_object/other_services.svg.license create mode 100644 assets/layers/binocular/binoculars_example.jpg.license create mode 100644 assets/layers/binocular/telescope.svg.license create mode 100644 assets/layers/birdhide/birdhide.svg.license create mode 100644 assets/layers/birdhide/birdshelter.svg.license create mode 100644 assets/layers/cafe_pub/cafe.svg.license create mode 100644 assets/layers/cafe_pub/nightclub.svg.license create mode 100644 assets/layers/cafe_pub/pub.svg.license create mode 100644 assets/layers/car_rental/car_rental.svg.license create mode 100644 assets/layers/charging_station/CEE7_4F.svg.license create mode 100644 assets/layers/charging_station/Chademo_type4.svg.license create mode 100644 assets/layers/charging_station/Tesla-hpwc-model-s.svg.license create mode 100644 assets/layers/charging_station/Type1-ccs.svg.license create mode 100644 assets/layers/charging_station/Type1_J1772.svg.license create mode 100644 assets/layers/charging_station/Type2_CCS.svg.license create mode 100644 assets/layers/charging_station/Type2_socket.svg.license create mode 100644 assets/layers/charging_station/Type2_tethered.svg.license create mode 100644 assets/layers/charging_station/Type3c.svg.license create mode 100644 assets/layers/charging_station/TypeE.svg.license create mode 100644 assets/layers/charging_station/bosch-3pin.svg.license create mode 100644 assets/layers/charging_station/bosch-5pin.svg.license create mode 100644 assets/layers/charging_station/under_construction.svg.license create mode 100644 assets/layers/charging_station/usb_port.svg.license create mode 100644 assets/layers/clock/clock.svg.license create mode 100644 assets/layers/clock/clock_digital.svg.license create mode 100644 assets/layers/crab_address/housenumber_blank.svg.license create mode 100644 assets/layers/crossings/180px-Trairvoja_mapeto.jpg.license create mode 100644 assets/layers/crossings/Belgian_road_sign_B22.svg.license create mode 100644 assets/layers/crossings/Belgian_road_sign_B23.svg.license create mode 100644 assets/layers/crossings/Vibrating_button_illustration.jpg.license create mode 100644 assets/layers/crossings/pedestrian_crossing.svg.license create mode 100644 assets/layers/crossings/traffic_lights.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg.license create mode 100644 assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg.license create mode 100644 assets/layers/defibrillator/defibrillator.svg.license create mode 100644 assets/layers/dentist/dentist.svg.license create mode 100644 assets/layers/doctors/doctors.svg.license create mode 100644 assets/layers/dogpark/dog-park.svg.license create mode 100644 assets/layers/drinking_water/drips.svg.license create mode 100644 assets/layers/elevator/elevator_wheelchair.svg.license create mode 100644 assets/layers/entrance/emergency_door.svg.license create mode 100644 assets/layers/entrance/entrance.svg.license create mode 100644 assets/layers/etymology/logo.svg.license create mode 100644 assets/layers/fitness_centre/gym.svg.license create mode 100644 assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg.license create mode 100644 assets/layers/fitness_station/Annecy_-_rower.jpg.license create mode 100644 assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg.license create mode 100644 assets/layers/fitness_station/Battling_ropes.jpg.license create mode 100644 assets/layers/fitness_station/Captains_chair.jpg.license create mode 100644 assets/layers/fitness_station/Exercise9159.jpg.license create mode 100644 assets/layers/fitness_station/Exercise9170.jpg.license create mode 100644 assets/layers/fitness_station/Exercise_Box.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_beam_jump.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_hurdling.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_leapfrog.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_slalom.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_stepping_stone.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_stretch_bars.jpg.license create mode 100644 assets/layers/fitness_station/Fitness_station_wall.jpg.license create mode 100644 assets/layers/fitness_station/Horizontal_ladder.jpg.license create mode 100644 assets/layers/fitness_station/Inclined_sit-up_and_hyperextension_bench.jpg.license create mode 100644 assets/layers/fitness_station/Inclined_sit-up_bench.jpg.license create mode 100644 assets/layers/fitness_station/Log_lifting_exercise.jpg.license create mode 100644 assets/layers/fitness_station/Outdoor_fitness_station_sign.jpg.license create mode 100644 assets/layers/fitness_station/Outdoor_stationary_bicycle.jpg.license create mode 100644 assets/layers/fitness_station/Push-up_bars.jpg.license create mode 100644 assets/layers/fitness_station/RIAN_archive_493268_Sports_at_a_kindergarten.jpg.license create mode 100644 assets/layers/fitness_station/Slacklineanlage_im_Dietenbachpark.jpg.license create mode 100644 assets/layers/fitness_station/Trimm-Dich-Pfad_Grünwalder_Forst_Klimmzüge.jpg.license create mode 100644 assets/layers/fitness_station/fitness.svg.license create mode 100644 assets/layers/food/Vegetarian-mark.svg.license create mode 100644 assets/layers/food/fastfood.svg.license create mode 100644 assets/layers/food/fries.svg.license create mode 100644 assets/layers/food/organic.svg.license create mode 100644 assets/layers/food/restaurant.svg.license create mode 100644 assets/layers/ghost_bike/ghost_bike.svg.license create mode 100644 assets/layers/governments/government.svg.license create mode 100644 assets/layers/hospital/hospital.svg.license create mode 100644 assets/layers/hotel/hotel.svg.license create mode 100644 assets/layers/hydrant/barcelona.jpg.license create mode 100644 assets/layers/hydrant/storz.jpg.license create mode 100644 assets/layers/icons/website.svg.license create mode 100644 assets/layers/id_presets/ID.svg.license create mode 100644 assets/layers/id_presets/fas-baby-carriage.svg.license create mode 100644 assets/layers/id_presets/fas-bath.svg.license create mode 100644 assets/layers/id_presets/fas-blender.svg.license create mode 100644 assets/layers/id_presets/fas-book.svg.license create mode 100644 assets/layers/id_presets/fas-camera-retro.svg.license create mode 100644 assets/layers/id_presets/fas-cannabis.svg.license create mode 100644 assets/layers/id_presets/fas-car-battery.svg.license create mode 100644 assets/layers/id_presets/fas-carrot.svg.license create mode 100644 assets/layers/id_presets/fas-cat.svg.license create mode 100644 assets/layers/id_presets/fas-cheese.svg.license create mode 100644 assets/layers/id_presets/fas-compact-disc.svg.license create mode 100644 assets/layers/id_presets/fas-couch.svg.license create mode 100644 assets/layers/id_presets/fas-crutch.svg.license create mode 100644 assets/layers/id_presets/fas-dice.svg.license create mode 100644 assets/layers/id_presets/fas-dolly.svg.license create mode 100644 assets/layers/id_presets/fas-door-open.svg.license create mode 100644 assets/layers/id_presets/fas-dragon.svg.license create mode 100644 assets/layers/id_presets/fas-futbol.svg.license create mode 100644 assets/layers/id_presets/fas-guitar.svg.license create mode 100644 assets/layers/id_presets/fas-hat-cowboy-side.svg.license create mode 100644 assets/layers/id_presets/fas-key.svg.license create mode 100644 assets/layers/id_presets/fas-laptop.svg.license create mode 100644 assets/layers/id_presets/fas-leaf.svg.license create mode 100644 assets/layers/id_presets/fas-microchip.svg.license create mode 100644 assets/layers/id_presets/fas-motorcycle.svg.license create mode 100644 assets/layers/id_presets/fas-newspaper.svg.license create mode 100644 assets/layers/id_presets/fas-paint-roller.svg.license create mode 100644 assets/layers/id_presets/fas-paperclip.svg.license create mode 100644 assets/layers/id_presets/fas-pills.svg.license create mode 100644 assets/layers/id_presets/fas-plug.svg.license create mode 100644 assets/layers/id_presets/fas-print.svg.license create mode 100644 assets/layers/id_presets/fas-rocket.svg.license create mode 100644 assets/layers/id_presets/fas-store.svg.license create mode 100644 assets/layers/id_presets/fas-suitcase-rolling.svg.license create mode 100644 assets/layers/id_presets/fas-suitcase.svg.license create mode 100644 assets/layers/id_presets/fas-tape.svg.license create mode 100644 assets/layers/id_presets/fas-tractor.svg.license create mode 100644 assets/layers/id_presets/fas-trophy.svg.license create mode 100644 assets/layers/id_presets/fas-vector-square.svg.license create mode 100644 assets/layers/id_presets/fas-wine-bottle.svg.license create mode 100644 assets/layers/id_presets/maki-alcohol-shop.svg.license create mode 100644 assets/layers/id_presets/maki-bakery.svg.license create mode 100644 assets/layers/id_presets/maki-bicycle.svg.license create mode 100644 assets/layers/id_presets/maki-car-repair.svg.license create mode 100644 assets/layers/id_presets/maki-car.svg.license create mode 100644 assets/layers/id_presets/maki-cemetery.svg.license create mode 100644 assets/layers/id_presets/maki-clothing-store.svg.license create mode 100644 assets/layers/id_presets/maki-confectionery.svg.license create mode 100644 assets/layers/id_presets/maki-florist.svg.license create mode 100644 assets/layers/id_presets/maki-gaming.svg.license create mode 100644 assets/layers/id_presets/maki-garden-centre.svg.license create mode 100644 assets/layers/id_presets/maki-gift.svg.license create mode 100644 assets/layers/id_presets/maki-grocery.svg.license create mode 100644 assets/layers/id_presets/maki-jewelry-store.svg.license create mode 100644 assets/layers/id_presets/maki-lodging.svg.license create mode 100644 assets/layers/id_presets/maki-optician.svg.license create mode 100644 assets/layers/id_presets/maki-shoe.svg.license create mode 100644 assets/layers/id_presets/maki-shop.svg.license create mode 100644 assets/layers/id_presets/maki-teahouse.svg.license create mode 100644 assets/layers/id_presets/maki-telephone.svg.license create mode 100644 assets/layers/id_presets/maki-warehouse.svg.license create mode 100644 assets/layers/id_presets/maki-watch.svg.license create mode 100644 assets/layers/id_presets/temaki-balloon.svg.license create mode 100644 assets/layers/id_presets/temaki-beauty_salon.svg.license create mode 100644 assets/layers/id_presets/temaki-boat.svg.license create mode 100644 assets/layers/id_presets/temaki-bottles.svg.license create mode 100644 assets/layers/id_presets/temaki-bow_and_arrow.svg.license create mode 100644 assets/layers/id_presets/temaki-camper_trailer.svg.license create mode 100644 assets/layers/id_presets/temaki-cleaver.svg.license create mode 100644 assets/layers/id_presets/temaki-cloth.svg.license create mode 100644 assets/layers/id_presets/temaki-clothes_hanger.svg.license create mode 100644 assets/layers/id_presets/temaki-coffee.svg.license create mode 100644 assets/layers/id_presets/temaki-compass.svg.license create mode 100644 assets/layers/id_presets/temaki-curtains.svg.license create mode 100644 assets/layers/id_presets/temaki-dagger.svg.license create mode 100644 assets/layers/id_presets/temaki-desk_lamp.svg.license create mode 100644 assets/layers/id_presets/temaki-fashion_accessories.svg.license create mode 100644 assets/layers/id_presets/temaki-fireplace.svg.license create mode 100644 assets/layers/id_presets/temaki-fish_cleaning.svg.license create mode 100644 assets/layers/id_presets/temaki-furniture.svg.license create mode 100644 assets/layers/id_presets/temaki-hair_care.svg.license create mode 100644 assets/layers/id_presets/temaki-hammer_shoe.svg.license create mode 100644 assets/layers/id_presets/temaki-handbag.svg.license create mode 100644 assets/layers/id_presets/temaki-hearing_aid.svg.license create mode 100644 assets/layers/id_presets/temaki-ice_fishing.svg.license create mode 100644 assets/layers/id_presets/temaki-kitchen_sink.svg.license create mode 100644 assets/layers/id_presets/temaki-laundry.svg.license create mode 100644 assets/layers/id_presets/temaki-lipstick.svg.license create mode 100644 assets/layers/id_presets/temaki-meat.svg.license create mode 100644 assets/layers/id_presets/temaki-military.svg.license create mode 100644 assets/layers/id_presets/temaki-money_hand.svg.license create mode 100644 assets/layers/id_presets/temaki-motorcycle_repair.svg.license create mode 100644 assets/layers/id_presets/temaki-movie_rental.svg.license create mode 100644 assets/layers/id_presets/temaki-needle_and_spool.svg.license create mode 100644 assets/layers/id_presets/temaki-perfume.svg.license create mode 100644 assets/layers/id_presets/temaki-pet_grooming.svg.license create mode 100644 assets/layers/id_presets/temaki-pipe.svg.license create mode 100644 assets/layers/id_presets/temaki-power.svg.license create mode 100644 assets/layers/id_presets/temaki-propane_tank.svg.license create mode 100644 assets/layers/id_presets/temaki-psychic.svg.license create mode 100644 assets/layers/id_presets/temaki-rocket_firework.svg.license create mode 100644 assets/layers/id_presets/temaki-scuba_diving.svg.license create mode 100644 assets/layers/id_presets/temaki-spa.svg.license create mode 100644 assets/layers/id_presets/temaki-speaker.svg.license create mode 100644 assets/layers/id_presets/temaki-spice_bottle.svg.license create mode 100644 assets/layers/id_presets/temaki-storage_fermenter.svg.license create mode 100644 assets/layers/id_presets/temaki-storage_rental.svg.license create mode 100644 assets/layers/id_presets/temaki-tattoo_machine.svg.license create mode 100644 assets/layers/id_presets/temaki-tiling.svg.license create mode 100644 assets/layers/id_presets/temaki-tire.svg.license create mode 100644 assets/layers/id_presets/temaki-tools.svg.license create mode 100644 assets/layers/id_presets/temaki-vacuum.svg.license create mode 100644 assets/layers/id_presets/temaki-vase.svg.license create mode 100644 assets/layers/id_presets/temaki-water_bottle.svg.license create mode 100644 assets/layers/id_presets/temaki-window.svg.license create mode 100644 assets/layers/indoors/room_administration.svg.license create mode 100644 assets/layers/indoors/room_auditorium.svg.license create mode 100644 assets/layers/indoors/room_bedroom.svg.license create mode 100644 assets/layers/indoors/room_chapel.svg.license create mode 100644 assets/layers/indoors/room_class.svg.license create mode 100644 assets/layers/indoors/room_computer.svg.license create mode 100644 assets/layers/indoors/room_conference.svg.license create mode 100644 assets/layers/indoors/room_crypt.svg.license create mode 100644 assets/layers/indoors/room_kitchen.svg.license create mode 100644 assets/layers/indoors/room_laboratory.svg.license create mode 100644 assets/layers/indoors/room_library.svg.license create mode 100644 assets/layers/indoors/room_locker.svg.license create mode 100644 assets/layers/indoors/room_nursery.svg.license create mode 100644 assets/layers/indoors/room_office.svg.license create mode 100644 assets/layers/indoors/room_prison_cell.svg.license create mode 100644 assets/layers/indoors/room_restaurant.svg.license create mode 100644 assets/layers/indoors/room_security_check.svg.license create mode 100644 assets/layers/indoors/room_sport.svg.license create mode 100644 assets/layers/indoors/room_storage.svg.license create mode 100644 assets/layers/indoors/room_technical.svg.license create mode 100644 assets/layers/indoors/room_toilets.svg.license create mode 100644 assets/layers/indoors/room_waiting.svg.license create mode 100644 assets/layers/information_board/board.svg.license create mode 100644 assets/layers/kerbs/KerbIcon.svg.license create mode 100644 assets/layers/kerbs/flush.svg.license create mode 100644 assets/layers/kerbs/lowered.svg.license create mode 100644 assets/layers/kerbs/no.svg.license create mode 100644 assets/layers/kerbs/raised.svg.license create mode 100644 assets/layers/kindergarten_childcare/childcare.svg.license create mode 100644 assets/layers/kindergarten_childcare/kindergarten.svg.license create mode 100644 assets/layers/map/map-stickered.svg.license create mode 100644 assets/layers/map/map.svg.license create mode 100644 assets/layers/map/osm-logo-buggy-attr.svg.license create mode 100644 assets/layers/map/osm-logo-white-bg.svg.license create mode 100644 assets/layers/maproulette/logomark.svg.license create mode 100644 assets/layers/maxspeed/living_street_be.svg.license create mode 100644 assets/layers/memorial/plaque.svg.license create mode 100644 assets/layers/nature_reserve/ANB.jpg.license create mode 100644 assets/layers/nature_reserve/Natuurpunt.jpg.license create mode 100644 assets/layers/nature_reserve/groen_logo.svg.license create mode 100644 assets/layers/nature_reserve/nature_reserve.svg.license create mode 100644 assets/layers/observation_tower/Tower_observation.svg.license create mode 100644 assets/layers/osm_community_index/osm.svg.license create mode 100644 assets/layers/parcel_lockers/parcel_lockers.svg.license create mode 100644 assets/layers/parking/parking.svg.license create mode 100644 assets/layers/parking_spaces/parking_space.svg.license create mode 100644 assets/layers/parking_ticket_machine/parking_tickets.svg.license create mode 100644 assets/layers/pharmacy/pharmacy.svg.license create mode 100644 assets/layers/physiotherapist/doctors.svg.license create mode 100644 assets/layers/picnic_table/picnic_table.svg.license create mode 100644 assets/layers/play_forest/icon.svg.license create mode 100644 assets/layers/postboxes/postbox.svg.license create mode 100644 assets/layers/postoffices/post_office.svg.license create mode 100644 assets/layers/questions/100euro.svg.license create mode 100644 assets/layers/questions/10cent.svg.license create mode 100644 assets/layers/questions/10euro.svg.license create mode 100644 assets/layers/questions/1cent.svg.license create mode 100644 assets/layers/questions/1euro.svg.license create mode 100644 assets/layers/questions/200euro.svg.license create mode 100644 assets/layers/questions/20cent.svg.license create mode 100644 assets/layers/questions/20euro.svg.license create mode 100644 assets/layers/questions/2cent.svg.license create mode 100644 assets/layers/questions/2euro.svg.license create mode 100644 assets/layers/questions/500euro.svg.license create mode 100644 assets/layers/questions/50cent.svg.license create mode 100644 assets/layers/questions/50euro.svg.license create mode 100644 assets/layers/questions/5cent.svg.license create mode 100644 assets/layers/questions/5euro.svg.license create mode 100644 assets/layers/questions/audio_induction_loop.svg.license create mode 100644 assets/layers/questions/audio_induction_loop_missing.svg.license create mode 100644 assets/layers/questions/cash.svg.license create mode 100644 assets/layers/questions/coins.svg.license create mode 100644 assets/layers/questions/nfc_card.svg.license create mode 100644 assets/layers/questions/no_smoking.svg.license create mode 100644 assets/layers/questions/notes.svg.license create mode 100644 assets/layers/questions/payment_card.svg.license create mode 100644 assets/layers/questions/phone.svg.license create mode 100644 assets/layers/questions/qrcode.svg.license create mode 100644 assets/layers/questions/send_email.svg.license create mode 100644 assets/layers/questions/smartphone.svg.license create mode 100644 assets/layers/questions/smoking.svg.license create mode 100644 assets/layers/reception_desk/reception_desk.svg.license create mode 100644 assets/layers/recycling/batteries.svg.license create mode 100644 assets/layers/recycling/beverage_cartons.svg.license create mode 100644 assets/layers/recycling/bicycles.svg.license create mode 100644 assets/layers/recycling/cans.svg.license create mode 100644 assets/layers/recycling/clothes.svg.license create mode 100644 assets/layers/recycling/cooking_oil.svg.license create mode 100644 assets/layers/recycling/engine_oil.svg.license create mode 100644 assets/layers/recycling/fluorescent_tubes.svg.license create mode 100644 assets/layers/recycling/garden_waste.svg.license create mode 100644 assets/layers/recycling/glass.svg.license create mode 100644 assets/layers/recycling/glass_bottles.svg.license create mode 100644 assets/layers/recycling/light_bulbs.svg.license create mode 100644 assets/layers/recycling/needles.svg.license create mode 100644 assets/layers/recycling/newspaper.svg.license create mode 100644 assets/layers/recycling/paper.svg.license create mode 100644 assets/layers/recycling/plastic.svg.license create mode 100644 assets/layers/recycling/plastic_bottles.svg.license create mode 100644 assets/layers/recycling/plastic_packaging.svg.license create mode 100644 assets/layers/recycling/printer_cartridges.svg.license create mode 100644 assets/layers/recycling/recycling-14.svg.license create mode 100644 assets/layers/recycling/scrap_metal.svg.license create mode 100644 assets/layers/recycling/shoes.svg.license create mode 100644 assets/layers/recycling/small_electrical_appliances.svg.license create mode 100644 assets/layers/school/college.svg.license create mode 100644 assets/layers/school/school.svg.license create mode 100644 assets/layers/shelter/shelter.svg.license create mode 100644 assets/layers/shops/shop-disused.svg.license create mode 100644 assets/layers/shower/shower.svg.license create mode 100644 assets/layers/slow_roads/slow_road.svg.license create mode 100644 assets/layers/slow_roads/woonerf.svg.license create mode 100644 assets/layers/speed_camera/speed_camera.svg.license create mode 100644 assets/layers/speed_display/speed_display.svg.license create mode 100644 assets/layers/sport_pitch/baseball.svg.license create mode 100644 assets/layers/sport_pitch/basketball.svg.license create mode 100644 assets/layers/sport_pitch/beachvolleyball.svg.license create mode 100644 assets/layers/sport_pitch/boules.svg.license create mode 100644 assets/layers/sport_pitch/equestrian.svg.license create mode 100644 assets/layers/sport_pitch/lock.svg.license create mode 100644 assets/layers/sport_pitch/skateboard.svg.license create mode 100644 assets/layers/sport_pitch/soccer.svg.license create mode 100644 assets/layers/sport_pitch/sport_pitch.svg.license create mode 100644 assets/layers/sport_pitch/table_tennis.svg.license create mode 100644 assets/layers/sport_pitch/tennis.svg.license create mode 100644 assets/layers/sport_pitch/volleyball.svg.license create mode 100644 assets/layers/sports_centre/sports_centre.svg.license create mode 100644 assets/layers/stairs/Braille_stairs.jpg.license create mode 100644 assets/layers/street_lamps/bent_pole_1.svg.license create mode 100644 assets/layers/street_lamps/bent_pole_2.svg.license create mode 100644 assets/layers/street_lamps/straight_pole.svg.license create mode 100644 assets/layers/street_lamps/street_lamp.svg.license create mode 100644 assets/layers/toilet/toilets.svg.license create mode 100644 assets/layers/toilet/urinal.svg.license create mode 100644 assets/layers/toilet/wheelchair.svg.license create mode 100644 assets/layers/trail/pushchair.svg.license create mode 100644 assets/layers/trail/trail.svg.license create mode 100644 assets/layers/trail/wheelchair.svg.license create mode 100644 assets/layers/transit_stops/bus_stop.svg.license create mode 100644 assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license create mode 100644 assets/layers/tree_node/broadleaved.svg.license create mode 100644 assets/layers/tree_node/leafless.svg.license create mode 100644 assets/layers/tree_node/needleleaved.svg.license create mode 100644 assets/layers/tree_node/unknown.svg.license create mode 100644 assets/layers/usersettings/translate_disabled.svg.license create mode 100644 assets/layers/usersettings/translate_mobile.svg.license create mode 100644 assets/layers/vending_machine/cow.svg.license create mode 100644 assets/layers/vending_machine/egg.svg.license create mode 100644 assets/layers/vending_machine/honey.svg.license create mode 100644 assets/layers/vending_machine/mug-saucer.svg.license create mode 100644 assets/layers/vending_machine/potato.svg.license create mode 100644 assets/layers/vending_machine/smoking.svg.license create mode 100644 assets/layers/vending_machine/utensils.svg.license create mode 100644 assets/layers/vending_machine/vending_machine.svg.license create mode 100644 assets/layers/veterinary/vet.svg.license create mode 100644 assets/layers/viewpoint/viewpoint.svg.license create mode 100644 assets/layers/visitor_information_centre/information.svg.license create mode 100644 assets/layers/walls_and_buildings/walls_and_buildings.png.license create mode 100644 assets/layers/waste_disposal/waste_disposal.svg.license create mode 100644 assets/svg/SocialImageForeground.svg.license create mode 100644 assets/svg/add.svg.license create mode 100644 assets/svg/addSmall.svg.license create mode 100644 assets/svg/add_pin.svg.license create mode 100644 assets/svg/back.svg.license create mode 100644 assets/svg/blocked.svg.license create mode 100644 assets/svg/brick_wall_raw.svg.license create mode 100644 assets/svg/brick_wall_round.svg.license create mode 100644 assets/svg/brick_wall_square.svg.license create mode 100644 assets/svg/bug.svg.license create mode 100644 assets/svg/camera-plus.svg.license create mode 100644 assets/svg/checkmark.svg.license create mode 100644 assets/svg/circle.svg.license create mode 100644 assets/svg/clock.svg.license create mode 100644 assets/svg/close.svg.license create mode 100644 assets/svg/community.svg.license create mode 100644 assets/svg/compass.svg.license create mode 100644 assets/svg/confirm.svg.license create mode 100644 assets/svg/copyright.svg.license create mode 100644 assets/svg/cross_bottom_right.svg.license create mode 100644 assets/svg/crosshair-locked.svg.license create mode 100644 assets/svg/crosshair.svg.license create mode 100644 assets/svg/delete_icon.svg.license create mode 100644 assets/svg/delete_not_allowed.svg.license create mode 100644 assets/svg/direction_gradient.svg.license create mode 100644 assets/svg/direction_stroke.svg.license create mode 100644 assets/svg/download.svg.license create mode 100644 assets/svg/duplicate.svg.license create mode 100644 assets/svg/elevator.svg.license create mode 100644 assets/svg/elevator_wheelchair.svg.license create mode 100644 assets/svg/envelope.svg.license create mode 100644 assets/svg/eye.svg.license create mode 100644 assets/svg/filter.svg.license create mode 100644 assets/svg/filter_disable.svg.license create mode 100644 assets/svg/floppy.svg.license create mode 100644 assets/svg/gear.svg.license create mode 100644 assets/svg/gender_bi.svg.license create mode 100644 assets/svg/gender_female.svg.license create mode 100644 assets/svg/gender_inter.svg.license create mode 100644 assets/svg/gender_male.svg.license create mode 100644 assets/svg/gender_queer.svg.license create mode 100644 assets/svg/gender_trans.svg.license create mode 100644 assets/svg/generic_map.svg.license create mode 100644 assets/svg/gps_arrow.svg.license create mode 100644 assets/svg/hand.svg.license create mode 100644 assets/svg/help.svg.license create mode 100644 assets/svg/home.svg.license create mode 100644 assets/svg/invalid.svg.license create mode 100644 assets/svg/josm_logo.svg.license create mode 100644 assets/svg/layers.svg.license create mode 100644 assets/svg/length-crosshair.svg.license create mode 100644 assets/svg/liberapay.svg.license create mode 100644 assets/svg/loading.svg.license create mode 100644 assets/svg/location-empty.svg.license create mode 100644 assets/svg/location-refused.svg.license create mode 100644 assets/svg/location.svg.license create mode 100644 assets/svg/location_locked.svg.license create mode 100644 assets/svg/location_unlocked.svg.license create mode 100644 assets/svg/login.svg.license create mode 100644 assets/svg/logo.svg.license create mode 100644 assets/svg/logout.svg.license create mode 100644 assets/svg/mapcomplete_logo.svg.license create mode 100644 assets/svg/mapillary.svg.license create mode 100644 assets/svg/mapillary_black.svg.license create mode 100644 assets/svg/mastodon.svg.license create mode 100644 assets/svg/min.svg.license create mode 100644 assets/svg/move-arrows.svg.license create mode 100644 assets/svg/move.svg.license create mode 100644 assets/svg/move_confirm.svg.license create mode 100644 assets/svg/move_not_allowed.svg.license create mode 100644 assets/svg/no_checkmark.svg.license create mode 100644 assets/svg/none.svg.license create mode 100644 assets/svg/not_found.svg.license create mode 100644 assets/svg/note.svg.license create mode 100644 assets/svg/osm-logo-us.svg.license create mode 100644 assets/svg/osm-logo.svg.license create mode 100644 assets/svg/party.svg.license create mode 100644 assets/svg/pencil.svg.license create mode 100644 assets/svg/person.svg.license create mode 100644 assets/svg/pin.svg.license create mode 100644 assets/svg/plantnet_logo.svg.license create mode 100644 assets/svg/plus.svg.license create mode 100644 assets/svg/pop-out.svg.license create mode 100644 assets/svg/reload.svg.license create mode 100644 assets/svg/relocation.svg.license create mode 100644 assets/svg/resolved.svg.license create mode 100644 assets/svg/ring.svg.license create mode 100644 assets/svg/robot.svg.license create mode 100644 assets/svg/satellite.svg.license create mode 100644 assets/svg/scissors.svg.license create mode 100644 assets/svg/search.svg.license create mode 100644 assets/svg/search_disable.svg.license create mode 100644 assets/svg/share.svg.license create mode 100644 assets/svg/speech_bubble.svg.license create mode 100644 assets/svg/speech_bubble_black_outline.svg.license create mode 100644 assets/svg/square.svg.license create mode 100644 assets/svg/star.svg.license create mode 100644 assets/svg/star_half.svg.license create mode 100644 assets/svg/star_outline.svg.license create mode 100644 assets/svg/star_outline_half.svg.license create mode 100644 assets/svg/statistics.svg.license create mode 100644 assets/svg/teardrop.svg.license create mode 100644 assets/svg/teardrop_with_hole_green.svg.license create mode 100644 assets/svg/translate.svg.license create mode 100644 assets/svg/triangle.svg.license create mode 100644 assets/svg/up.svg.license create mode 100644 assets/svg/upload.svg.license create mode 100644 assets/svg/wikidata.svg.license create mode 100644 assets/svg/wikimedia-commons-white.svg.license create mode 100644 assets/svg/wikipedia.svg.license create mode 100644 assets/themes/advertising/AdvertisingColumn_001.jpg.license create mode 100644 assets/themes/advertising/AdvertisingColumn_003.jpg.license create mode 100644 assets/themes/advertising/AdvertisingTotem_003.jpg.license create mode 100644 assets/themes/advertising/AdvertisingTotem_004.jpg.license create mode 100644 assets/themes/advertising/Advertising_flag.jpg.license create mode 100644 assets/themes/advertising/Aircraft_Sculpture.jpg.license create mode 100644 assets/themes/advertising/BS.JPG.license create mode 100644 assets/themes/advertising/Capitol_wall.jpg.license create mode 100644 assets/themes/advertising/City-Light-Poster.jpg.license create mode 100644 assets/themes/advertising/FGV_Founding.jpg.license create mode 100644 assets/themes/advertising/JR_Central.jpg.license create mode 100644 assets/themes/advertising/KFC_Billboard.jpg.license create mode 100644 assets/themes/advertising/LIDL_Billboard.jpg.license create mode 100644 assets/themes/advertising/Lidl_totem.jpg.license create mode 100644 assets/themes/advertising/Mug.jpg.license create mode 100644 assets/themes/advertising/Mupi_Alcoi.jpg.license create mode 100644 assets/themes/advertising/Mupi_spain.jpg.license create mode 100644 assets/themes/advertising/Repsol_Billboard.jpg.license create mode 100644 assets/themes/advertising/Screen_poster_box.jpg.license create mode 100644 assets/themes/advertising/Small_Board.jpg.license create mode 100644 assets/themes/advertising/Subway_screen.jpg.license create mode 100644 assets/themes/advertising/TV_media.jpg.license create mode 100644 assets/themes/advertising/Times square.jpg.license create mode 100644 assets/themes/advertising/Waitrose_sign.jpg.license create mode 100644 assets/themes/advertising/billboard.svg.license create mode 100644 assets/themes/advertising/board.svg.license create mode 100644 assets/themes/advertising/clarke_wall.jpg.license create mode 100644 assets/themes/advertising/column.svg.license create mode 100644 assets/themes/advertising/farma_sign.jpg.license create mode 100644 assets/themes/advertising/flag.svg.license create mode 100644 assets/themes/advertising/icon.svg.license create mode 100644 assets/themes/advertising/local_Board.jpg.license create mode 100644 assets/themes/advertising/newspaper_kiosk.svg.license create mode 100644 assets/themes/advertising/poster_box.svg.license create mode 100644 assets/themes/advertising/poster_box_no_support.svg.license create mode 100644 assets/themes/advertising/screen alcoi.jpg.license create mode 100644 assets/themes/advertising/screen.svg.license create mode 100644 assets/themes/advertising/screen_no_support.svg.license create mode 100644 assets/themes/advertising/sculpture.svg.license create mode 100644 assets/themes/advertising/sign.svg.license create mode 100644 assets/themes/advertising/sign_EOI.jpg.license create mode 100644 assets/themes/advertising/tarp.svg.license create mode 100644 assets/themes/advertising/tarp_feder.jpg.license create mode 100644 assets/themes/advertising/tarp_madrid.jpg.license create mode 100644 assets/themes/advertising/totem.svg.license create mode 100644 assets/themes/advertising/trivision.svg.license create mode 100644 assets/themes/advertising/wall_painting.svg.license create mode 100644 assets/themes/aed/aed.svg.license create mode 100644 assets/themes/artwork/artwork.svg.license create mode 100644 assets/themes/atm/logo.svg.license create mode 100644 assets/themes/bag/logo.svg.license create mode 100644 assets/themes/benches/bench_poi.svg.license create mode 100644 assets/themes/benches/bench_public_transport.svg.license create mode 100644 assets/themes/bicycle_rental/logo.svg.license create mode 100644 assets/themes/bicycle_rental/rental.svg.license create mode 100644 assets/themes/bicyclelib/logo.svg.license create mode 100644 assets/themes/blind_osm/Blindicon.svg.license create mode 100644 assets/themes/bookcases/bookcase.svg.license create mode 100644 assets/themes/buurtnatuur/ANB.jpg.license create mode 100644 assets/themes/buurtnatuur/Natuurpunt.jpg.license create mode 100644 assets/themes/buurtnatuur/forest.svg.license create mode 100644 assets/themes/buurtnatuur/groen_logo.svg.license create mode 100644 assets/themes/buurtnatuur/logo.svg.license create mode 100644 assets/themes/buurtnatuur/nature_reserve.svg.license create mode 100644 assets/themes/buurtnatuur/park.svg.license create mode 100644 assets/themes/buurtnatuur/social_image.jpg.license create mode 100644 assets/themes/campersite/caravan.svg.license create mode 100644 assets/themes/campersite/caravan_green.svg.license create mode 100644 assets/themes/campersite/sanitary_dump_station.svg.license create mode 100644 assets/themes/campersite/social_image.jpg.license create mode 100644 assets/themes/charging_stations/bicycle.svg.license create mode 100644 assets/themes/charging_stations/car.svg.license create mode 100644 assets/themes/charging_stations/logo.svg.license create mode 100644 assets/themes/charging_stations/plug.svg.license create mode 100644 assets/themes/climbing/carabiner.svg.license create mode 100644 assets/themes/climbing/climbing_gym.svg.license create mode 100644 assets/themes/climbing/climbing_icon.svg.license create mode 100644 assets/themes/climbing/climbing_no_rope.svg.license create mode 100644 assets/themes/climbing/climbing_rope.svg.license create mode 100644 assets/themes/climbing/climbing_route.svg.license create mode 100644 assets/themes/climbing/climbing_unknown.svg.license create mode 100644 assets/themes/climbing/club.svg.license create mode 100644 assets/themes/climbing/height.svg.license create mode 100644 assets/themes/cycle_highways/fietssnelwegen-logo.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double_length.png.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double_length.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double_template.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double_width.svg.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_single.png.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_squeeze.png.license create mode 100644 assets/themes/cycle_infra/Cycle_barrier_triple.png.license create mode 100644 assets/themes/cycle_infra/bicycleway.svg.license create mode 100644 assets/themes/cycle_infra/cycle-infra.svg.license create mode 100644 assets/themes/cycle_infra/street.svg.license create mode 100644 assets/themes/cyclenodes/logo.svg.license create mode 100644 assets/themes/cyclestreets/F111.svg.license create mode 100644 assets/themes/cyclestreets/F113.svg.license create mode 100644 assets/themes/cyclestreets/Finland_road_sign_E28.svg.license create mode 100644 assets/themes/cyclestreets/Finland_road_sign_E29.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244_1020-30.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244_1022-12.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244_1024-10.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg.license create mode 100644 assets/themes/cyclestreets/Zeichen_244a.svg.license create mode 100644 assets/themes/cyclestreets/logo.svg.license create mode 100644 assets/themes/cyclofix/fietsambassade_gent_logo.svg.license create mode 100644 assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license create mode 100644 assets/themes/cyclofix/key.svg.license create mode 100644 assets/themes/cyclofix/logo.svg.license create mode 100644 assets/themes/drinking_water/logo.svg.license create mode 100644 assets/themes/elongated_coin/penny.svg.license create mode 100644 assets/themes/facadegardens/bloei.svg.license create mode 100644 assets/themes/facadegardens/bodembedekker.svg.license create mode 100644 assets/themes/facadegardens/eetbaar.svg.license create mode 100644 assets/themes/facadegardens/gevelton.svg.license create mode 100644 assets/themes/facadegardens/geveltuin.svg.license create mode 100644 assets/themes/facadegardens/halfzon.svg.license create mode 100644 assets/themes/facadegardens/klimplant.svg.license create mode 100644 assets/themes/facadegardens/schaduw.svg.license create mode 100644 assets/themes/facadegardens/struik.svg.license create mode 100644 assets/themes/facadegardens/zon.svg.license create mode 100644 assets/themes/fritures/fries.svg.license create mode 100644 assets/themes/fritures/logo.svg.license create mode 100644 assets/themes/fruit_trees/fruit_tree.svg.license create mode 100644 assets/themes/ghostbikes/logo.svg.license create mode 100644 assets/themes/grb/housenumber_blank.svg.license create mode 100644 assets/themes/grb/logo.svg.license create mode 100644 assets/themes/grb/warning.svg.license create mode 100644 assets/themes/hackerspaces/glider.svg.license create mode 100644 assets/themes/hackerspaces/led.png.license create mode 100644 assets/themes/hailhydrant/Twemoji12_1f692.svg.license create mode 100644 assets/themes/hailhydrant/Twemoji12_1f9ef.svg.license create mode 100644 assets/themes/hailhydrant/Twemoji12_26d1.svg.license create mode 100644 assets/themes/hailhydrant/Twemoji_1f691.svg.license create mode 100644 assets/themes/hailhydrant/hydrant.svg.license create mode 100644 assets/themes/hailhydrant/hydrant_pillar.svg.license create mode 100644 assets/themes/hailhydrant/hydrant_underground.svg.license create mode 100644 assets/themes/hailhydrant/hydrant_unknown.svg.license create mode 100644 assets/themes/hailhydrant/logo.svg.license create mode 100644 assets/themes/maps/logo.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_10 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_100 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_110 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_120 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_130 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_140 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_20 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_30 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_40 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_50 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_60 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_70 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_80 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_90 mph.svg.license create mode 100644 assets/themes/maxspeed/maxspeed_logo.svg.license create mode 100644 assets/themes/nature/logo.svg.license create mode 100644 assets/themes/notes/logo.svg.license create mode 100644 assets/themes/onwheels/bicycle_pump.svg.license create mode 100644 assets/themes/onwheels/cafe.svg.license create mode 100644 assets/themes/onwheels/cone.svg.license create mode 100644 assets/themes/onwheels/crest.svg.license create mode 100644 assets/themes/onwheels/doctor.svg.license create mode 100644 assets/themes/onwheels/elevator.svg.license create mode 100644 assets/themes/onwheels/entrance.svg.license create mode 100644 assets/themes/onwheels/government.svg.license create mode 100644 assets/themes/onwheels/hospital.svg.license create mode 100644 assets/themes/onwheels/hotel.svg.license create mode 100644 assets/themes/onwheels/parking.svg.license create mode 100644 assets/themes/onwheels/pharmacy.svg.license create mode 100644 assets/themes/onwheels/repair.svg.license create mode 100644 assets/themes/onwheels/restaurant.svg.license create mode 100644 assets/themes/onwheels/shop.svg.license create mode 100644 assets/themes/onwheels/toilet.svg.license create mode 100644 assets/themes/openwindpowermap/logo.svg.license create mode 100644 assets/themes/openwindpowermap/wind_turbine.svg.license create mode 100644 assets/themes/osm_community_index/osm.svg.license create mode 100644 assets/themes/parkings/parkings.svg.license create mode 100644 assets/themes/pets/dog-food.svg.license create mode 100644 assets/themes/pets/dogshop.svg.license create mode 100644 assets/themes/pets/petshop.svg.license create mode 100644 assets/themes/playgrounds/playground.svg.license create mode 100644 assets/themes/postal_codes/townhall.svg.license create mode 100644 assets/themes/rainbow_crossings/crossing.svg.license create mode 100644 assets/themes/rainbow_crossings/logo.svg.license create mode 100644 assets/themes/shops/shop.svg.license create mode 100644 assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license create mode 100644 assets/themes/speelplekken/logo.svg.license create mode 100644 assets/themes/speelplekken/provincie_antwerpen.jpg.license create mode 100644 assets/themes/speelplekken/social_image.jpg.license create mode 100644 assets/themes/speelplekken/speelbos.svg.license create mode 100644 assets/themes/speelplekken/speeltuin.svg.license create mode 100644 assets/themes/speelplekken/speelweide.svg.license create mode 100644 assets/themes/speelplekken/youtube.svg.license create mode 100644 assets/themes/sports/sport.svg.license create mode 100644 assets/themes/stations/bench.svg.license create mode 100644 assets/themes/stations/bicycle_parking.svg.license create mode 100644 assets/themes/stations/departures_board.svg.license create mode 100644 assets/themes/stations/drinking_water.svg.license create mode 100644 assets/themes/stations/public_transport_tickets.svg.license create mode 100644 assets/themes/stations/rail-light.svg.license create mode 100644 assets/themes/stations/rental_bicycle.svg.license create mode 100644 assets/themes/surveillance/cam_left.svg.license create mode 100644 assets/themes/surveillance/cam_right.svg.license create mode 100644 assets/themes/surveillance/dome.svg.license create mode 100644 assets/themes/surveillance/logo.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license create mode 100644 assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair_and_pump.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/avatar.png.license create mode 100644 assets/themes/toerisme_vlaanderen/bench.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/bicycle_rental.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/charging_station_ebike.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/cycle_pump.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/cycle_repair.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/cycle_repair_and_pump.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/logo.png.license create mode 100644 assets/themes/toerisme_vlaanderen/logo.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/observation_platform.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/observation_tower.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/picnic_table.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt1.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt2.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt3.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt4.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt5.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/pin je punt6.jpg.license create mode 100644 assets/themes/toerisme_vlaanderen/playground.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/toilets.svg.license create mode 100644 assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg.license create mode 100644 assets/themes/toilets/toilets.svg.license create mode 100644 assets/themes/trees/logo.svg.license create mode 100644 assets/themes/uk_addresses/housenumber_add.svg.license create mode 100644 assets/themes/uk_addresses/housenumber_ok.svg.license create mode 100644 assets/themes/uk_addresses/housenumber_text.svg.license create mode 100644 assets/themes/uk_addresses/housenumber_unknown.svg.license create mode 100644 assets/themes/uk_addresses/housenumber_unknown_small.svg.license create mode 100644 assets/themes/uk_addresses/stamp-outline.png.license create mode 100644 assets/themes/waste_basket/waste_basket.svg.license create mode 100644 assets/themes/width/icon.svg.license delete mode 100644 generated.license_info.json diff --git a/.reuse/dep5 b/.reuse/dep5 index da6cf7a22..36a66a3b8 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,7 +3,7 @@ Upstream-Name: MapComplete Upstream-Contact: Pieter Vander Vennet Source: https://github.com/pietervdvn/MapComplete -Files: scripts/* UI/* Utils/* Customizations/* *.html Docs/* assets/*/*/*.json langs/* test/* Models/* Logic/* +Files: scripts/* src/* *.html Docs/* assets/*/*/*.json langs/* test/* assets/*/*/*.json public/assets/*/*/*.json public/css/* Copyright: MapComplete contributors License: GPL-3.0-or-later diff --git a/LICENSES/AGPL-3.0-only.txt b/LICENSES/AGPL-3.0-only.txt new file mode 100644 index 000000000..0c97efd25 --- /dev/null +++ b/LICENSES/AGPL-3.0-only.txt @@ -0,0 +1,235 @@ +GNU AFFERO GENERAL PUBLIC LICENSE +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. + +A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. + +The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. + +An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. + +The precise terms and conditions for copying, distribution and modification follow. + + TERMS AND CONDITIONS + +0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the Program. + +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), making available to the public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. + +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. + +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . diff --git a/LICENSES/CC-BY-2.0.txt b/LICENSES/CC-BY-2.0.txt new file mode 100644 index 000000000..86f93505c --- /dev/null +++ b/LICENSES/CC-BY-2.0.txt @@ -0,0 +1,81 @@ +Creative Commons Attribution 2.0 + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + + b. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + + c. "Licensor" means the individual or entity that offers the Work under the terms of this License. + + d. "Original Author" means the individual or entity who created the Work. + + e. "Work" means the copyrightable work of authorship offered under the terms of this License. + + f. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + a. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + + b. to create and reproduce Derivative Works; + + c. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + + d. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + + e. For the avoidance of doubt, where the work is a musical composition: + + i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + + ii. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + + f. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + a. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested. + + b. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give the Original Author credit reasonable to the medium or means You are utilizing by conveying the name (or pseudonym if applicable) of the Original Author if supplied; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + a. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + + b. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + + d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + + e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. diff --git a/LICENSES/CC-BY-3.0.txt b/LICENSES/CC-BY-3.0.txt new file mode 100644 index 000000000..465aae75c --- /dev/null +++ b/LICENSES/CC-BY-3.0.txt @@ -0,0 +1,93 @@ +Creative Commons Attribution 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + + b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. + + c. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + + d. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + + e. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + + f. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + + g. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + + h. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + + i. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + + b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + + c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + + d. to Distribute and Publicly Perform Adaptations. + + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + + ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + + iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. + + b. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + + c. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + + d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. + + e. This License may not be modified without the mutual written agreement of the Licensor and You. + + f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. + +Creative Commons Notice + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. + +Creative Commons may be contacted at http://creativecommons.org/. diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSES/CC-BY-4.0.txt new file mode 100644 index 000000000..13ca539f3 --- /dev/null +++ b/LICENSES/CC-BY-4.0.txt @@ -0,0 +1,156 @@ +Creative Commons Attribution 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + d. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + g. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + i. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + +b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/CC-BY-NC-4.0.txt b/LICENSES/CC-BY-NC-4.0.txt new file mode 100644 index 000000000..340cf0c95 --- /dev/null +++ b/LICENSES/CC-BY-NC-4.0.txt @@ -0,0 +1,158 @@ +Creative Commons Attribution-NonCommercial 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution-NonCommercial 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + d. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + g. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + i. NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange. + + j. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + k. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + l. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and + + B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/CC-BY-SA-2.0.txt b/LICENSES/CC-BY-SA-2.0.txt new file mode 100644 index 000000000..d1e03057f --- /dev/null +++ b/LICENSES/CC-BY-SA-2.0.txt @@ -0,0 +1,85 @@ +Creative Commons Attribution-ShareAlike 2.0 + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + + b. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + + c. "Licensor" means the individual or entity that offers the Work under the terms of this License. + + d. "Original Author" means the individual or entity who created the Work. + + e. "Work" means the copyrightable work of authorship offered under the terms of this License. + + f. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + + g. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + a. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + + b. to create and reproduce Derivative Works; + + c. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + + d. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + + e. For the avoidance of doubt, where the work is a musical composition: + + i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + + ii. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + + f. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + a. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested. + + b. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.0 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License. + + c. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give the Original Author credit reasonable to the medium or means You are utilizing by conveying the name (or pseudonym if applicable) of the Original Author if supplied; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + a. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + + b. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + + d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + + e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. diff --git a/LICENSES/CC-BY-SA-3.0.txt b/LICENSES/CC-BY-SA-3.0.txt new file mode 100644 index 000000000..39a8591c4 --- /dev/null +++ b/LICENSES/CC-BY-SA-3.0.txt @@ -0,0 +1,99 @@ +Creative Commons Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + + b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. + + c. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. + + d. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + + e. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + + f. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + + g. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + + h. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + + i. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + + j. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + + k. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + + b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + + c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + + d. to Distribute and Publicly Perform Adaptations. + + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + + ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + + iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. + + b. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. + + c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + + d. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + + d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + + e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + + f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. + +Creative Commons Notice + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License. + +Creative Commons may be contacted at http://creativecommons.org/. diff --git a/LICENSES/CC-BY-SA-4.0.txt b/LICENSES/CC-BY-SA-4.0.txt new file mode 100644 index 000000000..835a6836b --- /dev/null +++ b/LICENSES/CC-BY-SA-4.0.txt @@ -0,0 +1,170 @@ +Creative Commons Attribution-ShareAlike 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. + +Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution-ShareAlike 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply. + + C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + b. ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply. + + 1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt new file mode 100644 index 000000000..17cb28643 --- /dev/null +++ b/LICENSES/GPL-2.0-or-later.txt @@ -0,0 +1,117 @@ +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/LICENSES/GPL-3.0-only.txt b/LICENSES/GPL-3.0-only.txt new file mode 100644 index 000000000..f6cdd22a6 --- /dev/null +++ b/LICENSES/GPL-3.0-only.txt @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +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), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . + +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/LICENSES/ISC.txt b/LICENSES/ISC.txt new file mode 100644 index 000000000..b9c199c98 --- /dev/null +++ b/LICENSES/ISC.txt @@ -0,0 +1,8 @@ +ISC License: + +Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") +Copyright (c) 1995-2003 by Internet Software Consortium + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/LICENSES/LOGO.txt b/LICENSES/LOGO.txt new file mode 100644 index 000000000..cb76b7364 --- /dev/null +++ b/LICENSES/LOGO.txt @@ -0,0 +1,9 @@ +LOGO + +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 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. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 000000000..2071b23b0 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSES/WTFPL.txt b/LICENSES/WTFPL.txt new file mode 100644 index 000000000..7a3094a82 --- /dev/null +++ b/LICENSES/WTFPL.txt @@ -0,0 +1,11 @@ +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +Version 2, December 2004 + +Copyright (C) 2004 Sam Hocevar + +Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed. + +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/assets/layers/address/housenumber_blank.svg.license b/assets/layers/address/housenumber_blank.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/address/housenumber_blank.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/artwork/artwork.svg.license b/assets/layers/artwork/artwork.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/artwork/artwork.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/atm/atm.svg.license b/assets/layers/atm/atm.svg.license new file mode 100644 index 000000000..8f84c8961 --- /dev/null +++ b/assets/layers/atm/atm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Michael Glanznig; Andy Allan +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bank/bank.svg.license b/assets/layers/bank/bank.svg.license new file mode 100644 index 000000000..256cef175 --- /dev/null +++ b/assets/layers/bank/bank.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: nebulon42 +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/barrier/barrier.svg.license b/assets/layers/barrier/barrier.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/barrier/barrier.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bench/bench.svg.license b/assets/layers/bench/bench.svg.license new file mode 100644 index 000000000..1555ecc9d --- /dev/null +++ b/assets/layers/bench/bench.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bench/two_sided.svg.license b/assets/layers/bench/two_sided.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bench/two_sided.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bicycle_library/bicycle_library.svg.license b/assets/layers/bicycle_library/bicycle_library.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bicycle_library/bicycle_library.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bicycle_rental/rental.svg.license b/assets/layers/bicycle_rental/rental.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/layers/bicycle_rental/rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bicycle_tube_vending_machine/pinIcon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bicycle_tube_vending_machine/tube.svg.license b/assets/layers/bicycle_tube_vending_machine/tube.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bicycle_tube_vending_machine/tube.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bike_cafe/bike_cafe.svg.license b/assets/layers/bike_cafe/bike_cafe.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_cafe/bike_cafe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_cleaning/bike_cleaning.svg.license b/assets/layers/bike_cleaning/bike_cleaning.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bike_cleaning/bike_cleaning.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bike_cleaning/bike_cleaning_icon.svg.license b/assets/layers/bike_cleaning/bike_cleaning_icon.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bike_cleaning/bike_cleaning_icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/bollard.svg.license b/assets/layers/bike_parking/bollard.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/bollard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/handlebar_holder.svg.license b/assets/layers/bike_parking/handlebar_holder.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/handlebar_holder.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/parking.svg.license b/assets/layers/bike_parking/parking.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_parking/parking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/rack.svg.license b/assets/layers/bike_parking/rack.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/rack.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/shed.svg.license b/assets/layers/bike_parking/shed.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/shed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/staple.svg.license b/assets/layers/bike_parking/staple.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/staple.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/two_tier.svg.license b/assets/layers/bike_parking/two_tier.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/two_tier.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_parking/wall_loops.svg.license b/assets/layers/bike_parking/wall_loops.svg.license new file mode 100644 index 000000000..acb66e0ad --- /dev/null +++ b/assets/layers/bike_parking/wall_loops.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Vande Graveele +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/bike_pump.svg.license b/assets/layers/bike_repair_station/bike_pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/bike_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/broken_pump.svg.license b/assets/layers/bike_repair_station/broken_pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/broken_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/license_info.json b/assets/layers/bike_repair_station/license_info.json index 16db5b2bc..6eff80345 100644 --- a/assets/layers/bike_repair_station/license_info.json +++ b/assets/layers/bike_repair_station/license_info.json @@ -120,7 +120,7 @@ }, { "path": "repair_station_example_3.jpg", - "license": "CC-BY-SA-3.0-UNPORTED", + "license": "CC-BY-SA-3.0", "authors": [ "Thelmadatter" ], diff --git a/assets/layers/bike_repair_station/pump.svg.license b/assets/layers/bike_repair_station/pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/pump_example.png.license b/assets/layers/bike_repair_station/pump_example.png.license new file mode 100644 index 000000000..d220d0bdf --- /dev/null +++ b/assets/layers/bike_repair_station/pump_example.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Turvec Solutions +SPDX-License-Identifier: USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/bike_repair_station/pump_example_manual.jpg.license b/assets/layers/bike_repair_station/pump_example_manual.jpg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bike_repair_station/pump_example_manual.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ 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 new file mode 100644 index 000000000..8bebac341 --- /dev/null +++ b/assets/layers/bike_repair_station/pump_example_round.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ©Altinnova +SPDX-License-Identifier: USED-WITH-PERMISSION; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station.svg.license b/assets/layers/bike_repair_station/repair_station.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station_broken_pump.svg.license b/assets/layers/bike_repair_station/repair_station_broken_pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station_broken_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station_example.jpg.license b/assets/layers/bike_repair_station/repair_station_example.jpg.license new file mode 100644 index 000000000..d6393bb26 --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station_example.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear24 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station_example_2.jpg.license b/assets/layers/bike_repair_station/repair_station_example_2.jpg.license new file mode 100644 index 000000000..297906f32 --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station_example_2.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MOs810 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station_example_3.jpg.license b/assets/layers/bike_repair_station/repair_station_example_3.jpg.license new file mode 100644 index 000000000..526252d49 --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station_example_3.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Thelmadatter +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/layers/bike_repair_station/repair_station_pump.svg.license b/assets/layers/bike_repair_station/repair_station_pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_repair_station/repair_station_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_shop/pump.svg.license b/assets/layers/bike_shop/pump.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_shop/pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_shop/repair_shop.svg.license b/assets/layers/bike_shop/repair_shop.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_shop/repair_shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_shop/shop.svg.license b/assets/layers/bike_shop/shop.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_shop/shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_shop/tools.svg.license b/assets/layers/bike_shop/tools.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/bike_shop/tools.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/bike_themed_object/other_services.svg.license b/assets/layers/bike_themed_object/other_services.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/bike_themed_object/other_services.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/binocular/binoculars_example.jpg.license b/assets/layers/binocular/binoculars_example.jpg.license new file mode 100644 index 000000000..2d8710d00 --- /dev/null +++ b/assets/layers/binocular/binoculars_example.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Moheen Reeyad +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/binocular/license_info.json b/assets/layers/binocular/license_info.json index af31a3995..ceee70b37 100644 --- a/assets/layers/binocular/license_info.json +++ b/assets/layers/binocular/license_info.json @@ -11,7 +11,7 @@ }, { "path": "telescope.svg", - "license": "GPL", + "license": "GPL-2.0-or-later", "authors": [ "Kenny Sing/Elegant Themes" ], diff --git a/assets/layers/binocular/telescope.svg.license b/assets/layers/binocular/telescope.svg.license new file mode 100644 index 000000000..50a33de39 --- /dev/null +++ b/assets/layers/binocular/telescope.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kenny Sing/Elegant Themes +SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file diff --git a/assets/layers/birdhide/birdhide.svg.license b/assets/layers/birdhide/birdhide.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/birdhide/birdhide.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/birdhide/birdshelter.svg.license b/assets/layers/birdhide/birdshelter.svg.license new file mode 100644 index 000000000..25412d11f --- /dev/null +++ b/assets/layers/birdhide/birdshelter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome Free 5.2.0 by @fontawesome +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/cafe_pub/cafe.svg.license b/assets/layers/cafe_pub/cafe.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/cafe_pub/cafe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cafe_pub/nightclub.svg.license b/assets/layers/cafe_pub/nightclub.svg.license new file mode 100644 index 000000000..e4ca630ce --- /dev/null +++ b/assets/layers/cafe_pub/nightclub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Osm Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cafe_pub/pub.svg.license b/assets/layers/cafe_pub/pub.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/cafe_pub/pub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/car_rental/car_rental.svg.license b/assets/layers/car_rental/car_rental.svg.license new file mode 100644 index 000000000..0993eb1fb --- /dev/null +++ b/assets/layers/car_rental/car_rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: American Institute of Graphic Arts +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/charging_station/CEE7_4F.svg.license b/assets/layers/charging_station/CEE7_4F.svg.license new file mode 100644 index 000000000..52caac531 --- /dev/null +++ b/assets/layers/charging_station/CEE7_4F.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gabor111a +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/layers/charging_station/Chademo_type4.svg.license b/assets/layers/charging_station/Chademo_type4.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Chademo_type4.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Tesla-hpwc-model-s.svg.license b/assets/layers/charging_station/Tesla-hpwc-model-s.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Tesla-hpwc-model-s.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type1-ccs.svg.license b/assets/layers/charging_station/Type1-ccs.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Type1-ccs.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type1_J1772.svg.license b/assets/layers/charging_station/Type1_J1772.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Type1_J1772.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type2_CCS.svg.license b/assets/layers/charging_station/Type2_CCS.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Type2_CCS.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type2_socket.svg.license b/assets/layers/charging_station/Type2_socket.svg.license new file mode 100644 index 000000000..5669f6c6d --- /dev/null +++ b/assets/layers/charging_station/Type2_socket.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type2_tethered.svg.license b/assets/layers/charging_station/Type2_tethered.svg.license new file mode 100644 index 000000000..be5a85ad9 --- /dev/null +++ b/assets/layers/charging_station/Type2_tethered.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GreatDrok; Open Charge Map +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/Type3c.svg.license b/assets/layers/charging_station/Type3c.svg.license new file mode 100644 index 000000000..7891491f1 --- /dev/null +++ b/assets/layers/charging_station/Type3c.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pyrog +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/charging_station/TypeE.svg.license b/assets/layers/charging_station/TypeE.svg.license new file mode 100644 index 000000000..2fb48b19c --- /dev/null +++ b/assets/layers/charging_station/TypeE.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: pietervdvn +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/layers/charging_station/bosch-3pin.svg.license b/assets/layers/charging_station/bosch-3pin.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/charging_station/bosch-3pin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/charging_station/bosch-5pin.svg.license b/assets/layers/charging_station/bosch-5pin.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/charging_station/bosch-5pin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/charging_station/under_construction.svg.license b/assets/layers/charging_station/under_construction.svg.license new file mode 100644 index 000000000..29bc7cf6d --- /dev/null +++ b/assets/layers/charging_station/under_construction.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Sarang +SPDX-License-Identifier: PUBLIC-DOMAIN \ No newline at end of file diff --git a/assets/layers/charging_station/usb_port.svg.license b/assets/layers/charging_station/usb_port.svg.license new file mode 100644 index 000000000..52d6dc2b4 --- /dev/null +++ b/assets/layers/charging_station/usb_port.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Ryan Dardis +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/clock/clock.svg.license b/assets/layers/clock/clock.svg.license new file mode 100644 index 000000000..0b158a205 --- /dev/null +++ b/assets/layers/clock/clock.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: SJJB Management +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/clock/clock_digital.svg.license b/assets/layers/clock/clock_digital.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/clock/clock_digital.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/crab_address/housenumber_blank.svg.license b/assets/layers/crab_address/housenumber_blank.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/crab_address/housenumber_blank.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/crossings/180px-Trairvoja_mapeto.jpg.license b/assets/layers/crossings/180px-Trairvoja_mapeto.jpg.license new file mode 100644 index 000000000..2cb782153 --- /dev/null +++ b/assets/layers/crossings/180px-Trairvoja_mapeto.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Martin Constantino–Bodin +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/crossings/Belgian_road_sign_B22.svg.license b/assets/layers/crossings/Belgian_road_sign_B22.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/crossings/Belgian_road_sign_B22.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/crossings/Belgian_road_sign_B23.svg.license b/assets/layers/crossings/Belgian_road_sign_B23.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/crossings/Belgian_road_sign_B23.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/crossings/Vibrating_button_illustration.jpg.license b/assets/layers/crossings/Vibrating_button_illustration.jpg.license new file mode 100644 index 000000000..90c3a8a86 --- /dev/null +++ b/assets/layers/crossings/Vibrating_button_illustration.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/crossings/pedestrian_crossing.svg.license b/assets/layers/crossings/pedestrian_crossing.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/crossings/pedestrian_crossing.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/crossings/traffic_lights.svg.license b/assets/layers/crossings/traffic_lights.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/crossings/traffic_lights.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg.license new file mode 100644 index 000000000..54df4811c --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Ministerie van Infrastructuur en Waterstaat +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg.license new file mode 100644 index 000000000..54df4811c --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Ministerie van Infrastructuur en Waterstaat +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg.license b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg.license new file mode 100644 index 000000000..54df4811c --- /dev/null +++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Ministerie van Infrastructuur en Waterstaat +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/defibrillator/defibrillator.svg.license b/assets/layers/defibrillator/defibrillator.svg.license new file mode 100644 index 000000000..76674af11 --- /dev/null +++ b/assets/layers/defibrillator/defibrillator.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MaxxL +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/dentist/dentist.svg.license b/assets/layers/dentist/dentist.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/dentist/dentist.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/doctors/doctors.svg.license b/assets/layers/doctors/doctors.svg.license new file mode 100644 index 000000000..a48fd496b --- /dev/null +++ b/assets/layers/doctors/doctors.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: osmcarto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/dogpark/dog-park.svg.license b/assets/layers/dogpark/dog-park.svg.license new file mode 100644 index 000000000..1ba744f72 --- /dev/null +++ b/assets/layers/dogpark/dog-park.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Public Domain Symbols; Niels Elgaard Larsen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/drinking_water/drips.svg.license b/assets/layers/drinking_water/drips.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/layers/drinking_water/drips.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/elevator/elevator_wheelchair.svg.license b/assets/layers/elevator/elevator_wheelchair.svg.license new file mode 100644 index 000000000..385f62416 --- /dev/null +++ b/assets/layers/elevator/elevator_wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://www.ctsteward.com/ +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/entrance/emergency_door.svg.license b/assets/layers/entrance/emergency_door.svg.license new file mode 100644 index 000000000..5eebaa948 --- /dev/null +++ b/assets/layers/entrance/emergency_door.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: PanierAvide +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/entrance/entrance.svg.license b/assets/layers/entrance/entrance.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/layers/entrance/entrance.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/etymology/logo.svg.license b/assets/layers/etymology/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/etymology/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/fitness_centre/gym.svg.license b/assets/layers/fitness_centre/gym.svg.license new file mode 100644 index 000000000..442391ab7 --- /dev/null +++ b/assets/layers/fitness_centre/gym.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bernd Lakenbrink; Noun Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg.license b/assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg.license new file mode 100644 index 000000000..7a6c37c18 --- /dev/null +++ b/assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kolforn +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Annecy_-_rower.jpg.license b/assets/layers/fitness_station/Annecy_-_rower.jpg.license new file mode 100644 index 000000000..9fd43a137 --- /dev/null +++ b/assets/layers/fitness_station/Annecy_-_rower.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tiia Monto +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg.license b/assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg.license new file mode 100644 index 000000000..3232e7644 --- /dev/null +++ b/assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Piotrus +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Battling_ropes.jpg.license b/assets/layers/fitness_station/Battling_ropes.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Battling_ropes.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Captains_chair.jpg.license b/assets/layers/fitness_station/Captains_chair.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Captains_chair.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Exercise9159.jpg.license b/assets/layers/fitness_station/Exercise9159.jpg.license new file mode 100644 index 000000000..a1adb9ee4 --- /dev/null +++ b/assets/layers/fitness_station/Exercise9159.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: יעקב +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Exercise9170.jpg.license b/assets/layers/fitness_station/Exercise9170.jpg.license new file mode 100644 index 000000000..a1adb9ee4 --- /dev/null +++ b/assets/layers/fitness_station/Exercise9170.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: יעקב +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Exercise_Box.jpg.license b/assets/layers/fitness_station/Exercise_Box.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Exercise_Box.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_beam_jump.jpg.license b/assets/layers/fitness_station/Fitness_station_beam_jump.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_beam_jump.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_hurdling.jpg.license b/assets/layers/fitness_station/Fitness_station_hurdling.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_hurdling.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_leapfrog.jpg.license b/assets/layers/fitness_station/Fitness_station_leapfrog.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_leapfrog.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_slalom.jpg.license b/assets/layers/fitness_station/Fitness_station_slalom.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_slalom.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_stepping_stone.jpg.license b/assets/layers/fitness_station/Fitness_station_stepping_stone.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_stepping_stone.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_stretch_bars.jpg.license b/assets/layers/fitness_station/Fitness_station_stretch_bars.jpg.license new file mode 100644 index 000000000..ec667f527 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_stretch_bars.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Fitness_station_wall.jpg.license b/assets/layers/fitness_station/Fitness_station_wall.jpg.license new file mode 100644 index 000000000..a54bb1c85 --- /dev/null +++ b/assets/layers/fitness_station/Fitness_station_wall.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Axelos; Al-Hun +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Horizontal_ladder.jpg.license b/assets/layers/fitness_station/Horizontal_ladder.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Horizontal_ladder.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Inclined_sit-up_and_hyperextension_bench.jpg.license b/assets/layers/fitness_station/Inclined_sit-up_and_hyperextension_bench.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Inclined_sit-up_and_hyperextension_bench.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Inclined_sit-up_bench.jpg.license b/assets/layers/fitness_station/Inclined_sit-up_bench.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Inclined_sit-up_bench.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Log_lifting_exercise.jpg.license b/assets/layers/fitness_station/Log_lifting_exercise.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Log_lifting_exercise.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Outdoor_fitness_station_sign.jpg.license b/assets/layers/fitness_station/Outdoor_fitness_station_sign.jpg.license new file mode 100644 index 000000000..dee5c3be2 --- /dev/null +++ b/assets/layers/fitness_station/Outdoor_fitness_station_sign.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: kaitu +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Outdoor_stationary_bicycle.jpg.license b/assets/layers/fitness_station/Outdoor_stationary_bicycle.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Outdoor_stationary_bicycle.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Push-up_bars.jpg.license b/assets/layers/fitness_station/Push-up_bars.jpg.license new file mode 100644 index 000000000..8bc73b25a --- /dev/null +++ b/assets/layers/fitness_station/Push-up_bars.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tpikonen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/RIAN_archive_493268_Sports_at_a_kindergarten.jpg.license b/assets/layers/fitness_station/RIAN_archive_493268_Sports_at_a_kindergarten.jpg.license new file mode 100644 index 000000000..03d0f8188 --- /dev/null +++ b/assets/layers/fitness_station/RIAN_archive_493268_Sports_at_a_kindergarten.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Igor Utkin +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Slacklineanlage_im_Dietenbachpark.jpg.license b/assets/layers/fitness_station/Slacklineanlage_im_Dietenbachpark.jpg.license new file mode 100644 index 000000000..40ac1e93c --- /dev/null +++ b/assets/layers/fitness_station/Slacklineanlage_im_Dietenbachpark.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andreas Schwarzkopf +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/Trimm-Dich-Pfad_Grünwalder_Forst_Klimmzüge.jpg.license b/assets/layers/fitness_station/Trimm-Dich-Pfad_Grünwalder_Forst_Klimmzüge.jpg.license new file mode 100644 index 000000000..9f9bc3b1b --- /dev/null +++ b/assets/layers/fitness_station/Trimm-Dich-Pfad_Grünwalder_Forst_Klimmzüge.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Zeitlupe +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/fitness_station/fitness.svg.license b/assets/layers/fitness_station/fitness.svg.license new file mode 100644 index 000000000..c99e4e246 --- /dev/null +++ b/assets/layers/fitness_station/fitness.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kocio +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 new file mode 100644 index 000000000..c7e057e6e --- /dev/null +++ b/assets/layers/food/Vegetarian-mark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: European Vegetarian Union +SPDX-License-Identifier: PD \ No newline at end of file diff --git a/assets/layers/food/fastfood.svg.license b/assets/layers/food/fastfood.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/food/fastfood.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/food/fries.svg.license b/assets/layers/food/fries.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/layers/food/fries.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/food/organic.svg.license b/assets/layers/food/organic.svg.license new file mode 100644 index 000000000..0f9f180ce --- /dev/null +++ b/assets/layers/food/organic.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: European Commission +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/food/restaurant.svg.license b/assets/layers/food/restaurant.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/food/restaurant.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/ghost_bike/ghost_bike.svg.license b/assets/layers/ghost_bike/ghost_bike.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/ghost_bike/ghost_bike.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/governments/government.svg.license b/assets/layers/governments/government.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/governments/government.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/hospital/hospital.svg.license b/assets/layers/hospital/hospital.svg.license new file mode 100644 index 000000000..a48fd496b --- /dev/null +++ b/assets/layers/hospital/hospital.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: osmcarto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/hotel/hotel.svg.license b/assets/layers/hotel/hotel.svg.license new file mode 100644 index 000000000..01764961f --- /dev/null +++ b/assets/layers/hotel/hotel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andy Allan; Michael Glanznig; Adamant36; Paul Dicker +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/hydrant/barcelona.jpg.license b/assets/layers/hydrant/barcelona.jpg.license new file mode 100644 index 000000000..df19c13f9 --- /dev/null +++ b/assets/layers/hydrant/barcelona.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CLIGNER +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/hydrant/storz.jpg.license b/assets/layers/hydrant/storz.jpg.license new file mode 100644 index 000000000..5d47aaec0 --- /dev/null +++ b/assets/layers/hydrant/storz.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Karl Gruber +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/icons/website.svg.license b/assets/layers/icons/website.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/icons/website.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/ID.svg.license b/assets/layers/id_presets/ID.svg.license new file mode 100644 index 000000000..dd4bd4aec --- /dev/null +++ b/assets/layers/id_presets/ID.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iD editor +SPDX-License-Identifier: WTFPL \ No newline at end of file diff --git a/assets/layers/id_presets/fas-baby-carriage.svg.license b/assets/layers/id_presets/fas-baby-carriage.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-baby-carriage.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-bath.svg.license b/assets/layers/id_presets/fas-bath.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-bath.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-blender.svg.license b/assets/layers/id_presets/fas-blender.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-blender.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-book.svg.license b/assets/layers/id_presets/fas-book.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-book.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-camera-retro.svg.license b/assets/layers/id_presets/fas-camera-retro.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-camera-retro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-cannabis.svg.license b/assets/layers/id_presets/fas-cannabis.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-cannabis.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-car-battery.svg.license b/assets/layers/id_presets/fas-car-battery.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-car-battery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-carrot.svg.license b/assets/layers/id_presets/fas-carrot.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-carrot.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-cat.svg.license b/assets/layers/id_presets/fas-cat.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-cat.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-cheese.svg.license b/assets/layers/id_presets/fas-cheese.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-cheese.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-compact-disc.svg.license b/assets/layers/id_presets/fas-compact-disc.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-compact-disc.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-couch.svg.license b/assets/layers/id_presets/fas-couch.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-couch.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-crutch.svg.license b/assets/layers/id_presets/fas-crutch.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-crutch.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-dice.svg.license b/assets/layers/id_presets/fas-dice.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-dice.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-dolly.svg.license b/assets/layers/id_presets/fas-dolly.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-dolly.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-door-open.svg.license b/assets/layers/id_presets/fas-door-open.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-door-open.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-dragon.svg.license b/assets/layers/id_presets/fas-dragon.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-dragon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-futbol.svg.license b/assets/layers/id_presets/fas-futbol.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-futbol.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-guitar.svg.license b/assets/layers/id_presets/fas-guitar.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-guitar.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-hat-cowboy-side.svg.license b/assets/layers/id_presets/fas-hat-cowboy-side.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-hat-cowboy-side.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-key.svg.license b/assets/layers/id_presets/fas-key.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-key.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-laptop.svg.license b/assets/layers/id_presets/fas-laptop.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-laptop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-leaf.svg.license b/assets/layers/id_presets/fas-leaf.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-leaf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-microchip.svg.license b/assets/layers/id_presets/fas-microchip.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-microchip.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-motorcycle.svg.license b/assets/layers/id_presets/fas-motorcycle.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-motorcycle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-newspaper.svg.license b/assets/layers/id_presets/fas-newspaper.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-newspaper.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-paint-roller.svg.license b/assets/layers/id_presets/fas-paint-roller.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-paint-roller.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-paperclip.svg.license b/assets/layers/id_presets/fas-paperclip.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-paperclip.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-pills.svg.license b/assets/layers/id_presets/fas-pills.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-pills.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-plug.svg.license b/assets/layers/id_presets/fas-plug.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-plug.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-print.svg.license b/assets/layers/id_presets/fas-print.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-print.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-rocket.svg.license b/assets/layers/id_presets/fas-rocket.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-rocket.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-store.svg.license b/assets/layers/id_presets/fas-store.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-store.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-suitcase-rolling.svg.license b/assets/layers/id_presets/fas-suitcase-rolling.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-suitcase-rolling.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-suitcase.svg.license b/assets/layers/id_presets/fas-suitcase.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-suitcase.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-tape.svg.license b/assets/layers/id_presets/fas-tape.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-tape.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-tractor.svg.license b/assets/layers/id_presets/fas-tractor.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-tractor.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-trophy.svg.license b/assets/layers/id_presets/fas-trophy.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-trophy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-vector-square.svg.license b/assets/layers/id_presets/fas-vector-square.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-vector-square.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/fas-wine-bottle.svg.license b/assets/layers/id_presets/fas-wine-bottle.svg.license new file mode 100644 index 000000000..65998a09c --- /dev/null +++ b/assets/layers/id_presets/fas-wine-bottle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font-Awesome icon set +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-alcohol-shop.svg.license b/assets/layers/id_presets/maki-alcohol-shop.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-alcohol-shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-bakery.svg.license b/assets/layers/id_presets/maki-bakery.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-bakery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-bicycle.svg.license b/assets/layers/id_presets/maki-bicycle.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-bicycle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-car-repair.svg.license b/assets/layers/id_presets/maki-car-repair.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-car-repair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-car.svg.license b/assets/layers/id_presets/maki-car.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-car.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-cemetery.svg.license b/assets/layers/id_presets/maki-cemetery.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-cemetery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-clothing-store.svg.license b/assets/layers/id_presets/maki-clothing-store.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-clothing-store.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-confectionery.svg.license b/assets/layers/id_presets/maki-confectionery.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-confectionery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-florist.svg.license b/assets/layers/id_presets/maki-florist.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-florist.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-gaming.svg.license b/assets/layers/id_presets/maki-gaming.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-gaming.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-garden-centre.svg.license b/assets/layers/id_presets/maki-garden-centre.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-garden-centre.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-gift.svg.license b/assets/layers/id_presets/maki-gift.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-gift.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-grocery.svg.license b/assets/layers/id_presets/maki-grocery.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-grocery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-jewelry-store.svg.license b/assets/layers/id_presets/maki-jewelry-store.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-jewelry-store.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-lodging.svg.license b/assets/layers/id_presets/maki-lodging.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-lodging.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-optician.svg.license b/assets/layers/id_presets/maki-optician.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-optician.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-shoe.svg.license b/assets/layers/id_presets/maki-shoe.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-shoe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-shop.svg.license b/assets/layers/id_presets/maki-shop.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-teahouse.svg.license b/assets/layers/id_presets/maki-teahouse.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-teahouse.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-telephone.svg.license b/assets/layers/id_presets/maki-telephone.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-telephone.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-warehouse.svg.license b/assets/layers/id_presets/maki-warehouse.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-warehouse.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/maki-watch.svg.license b/assets/layers/id_presets/maki-watch.svg.license new file mode 100644 index 000000000..af4d41000 --- /dev/null +++ b/assets/layers/id_presets/maki-watch.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-balloon.svg.license b/assets/layers/id_presets/temaki-balloon.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-balloon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-beauty_salon.svg.license b/assets/layers/id_presets/temaki-beauty_salon.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-beauty_salon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-boat.svg.license b/assets/layers/id_presets/temaki-boat.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-boat.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-bottles.svg.license b/assets/layers/id_presets/temaki-bottles.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-bottles.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-bow_and_arrow.svg.license b/assets/layers/id_presets/temaki-bow_and_arrow.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-bow_and_arrow.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-camper_trailer.svg.license b/assets/layers/id_presets/temaki-camper_trailer.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-camper_trailer.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-cleaver.svg.license b/assets/layers/id_presets/temaki-cleaver.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-cleaver.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-cloth.svg.license b/assets/layers/id_presets/temaki-cloth.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-cloth.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-clothes_hanger.svg.license b/assets/layers/id_presets/temaki-clothes_hanger.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-clothes_hanger.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-coffee.svg.license b/assets/layers/id_presets/temaki-coffee.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-coffee.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-compass.svg.license b/assets/layers/id_presets/temaki-compass.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-compass.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-curtains.svg.license b/assets/layers/id_presets/temaki-curtains.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-curtains.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-dagger.svg.license b/assets/layers/id_presets/temaki-dagger.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-dagger.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-desk_lamp.svg.license b/assets/layers/id_presets/temaki-desk_lamp.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-desk_lamp.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-fashion_accessories.svg.license b/assets/layers/id_presets/temaki-fashion_accessories.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-fashion_accessories.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-fireplace.svg.license b/assets/layers/id_presets/temaki-fireplace.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-fireplace.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-fish_cleaning.svg.license b/assets/layers/id_presets/temaki-fish_cleaning.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-fish_cleaning.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-furniture.svg.license b/assets/layers/id_presets/temaki-furniture.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-furniture.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-hair_care.svg.license b/assets/layers/id_presets/temaki-hair_care.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-hair_care.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-hammer_shoe.svg.license b/assets/layers/id_presets/temaki-hammer_shoe.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-hammer_shoe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-handbag.svg.license b/assets/layers/id_presets/temaki-handbag.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-handbag.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-hearing_aid.svg.license b/assets/layers/id_presets/temaki-hearing_aid.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-hearing_aid.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-ice_fishing.svg.license b/assets/layers/id_presets/temaki-ice_fishing.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-ice_fishing.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-kitchen_sink.svg.license b/assets/layers/id_presets/temaki-kitchen_sink.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-kitchen_sink.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-laundry.svg.license b/assets/layers/id_presets/temaki-laundry.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-laundry.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-lipstick.svg.license b/assets/layers/id_presets/temaki-lipstick.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-lipstick.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-meat.svg.license b/assets/layers/id_presets/temaki-meat.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-meat.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-military.svg.license b/assets/layers/id_presets/temaki-military.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-military.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-money_hand.svg.license b/assets/layers/id_presets/temaki-money_hand.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-money_hand.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-motorcycle_repair.svg.license b/assets/layers/id_presets/temaki-motorcycle_repair.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-motorcycle_repair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-movie_rental.svg.license b/assets/layers/id_presets/temaki-movie_rental.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-movie_rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-needle_and_spool.svg.license b/assets/layers/id_presets/temaki-needle_and_spool.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-needle_and_spool.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-perfume.svg.license b/assets/layers/id_presets/temaki-perfume.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-perfume.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-pet_grooming.svg.license b/assets/layers/id_presets/temaki-pet_grooming.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-pet_grooming.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-pipe.svg.license b/assets/layers/id_presets/temaki-pipe.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-pipe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-power.svg.license b/assets/layers/id_presets/temaki-power.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-power.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-propane_tank.svg.license b/assets/layers/id_presets/temaki-propane_tank.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-propane_tank.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-psychic.svg.license b/assets/layers/id_presets/temaki-psychic.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-psychic.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-rocket_firework.svg.license b/assets/layers/id_presets/temaki-rocket_firework.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-rocket_firework.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-scuba_diving.svg.license b/assets/layers/id_presets/temaki-scuba_diving.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-scuba_diving.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-spa.svg.license b/assets/layers/id_presets/temaki-spa.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-spa.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-speaker.svg.license b/assets/layers/id_presets/temaki-speaker.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-speaker.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-spice_bottle.svg.license b/assets/layers/id_presets/temaki-spice_bottle.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-spice_bottle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-storage_fermenter.svg.license b/assets/layers/id_presets/temaki-storage_fermenter.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-storage_fermenter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-storage_rental.svg.license b/assets/layers/id_presets/temaki-storage_rental.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-storage_rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-tattoo_machine.svg.license b/assets/layers/id_presets/temaki-tattoo_machine.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-tattoo_machine.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-tiling.svg.license b/assets/layers/id_presets/temaki-tiling.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-tiling.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-tire.svg.license b/assets/layers/id_presets/temaki-tire.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-tire.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-tools.svg.license b/assets/layers/id_presets/temaki-tools.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-tools.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-vacuum.svg.license b/assets/layers/id_presets/temaki-vacuum.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-vacuum.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-vase.svg.license b/assets/layers/id_presets/temaki-vase.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-vase.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-water_bottle.svg.license b/assets/layers/id_presets/temaki-water_bottle.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-water_bottle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/id_presets/temaki-window.svg.license b/assets/layers/id_presets/temaki-window.svg.license new file mode 100644 index 000000000..6de580162 --- /dev/null +++ b/assets/layers/id_presets/temaki-window.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki icon set +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json index 858f28f2e..26aec244e 100644 --- a/assets/layers/indoors/license_info.json +++ b/assets/layers/indoors/license_info.json @@ -1,7 +1,7 @@ [ { "path": "room_administration.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -11,7 +11,7 @@ }, { "path": "room_auditorium.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -21,7 +21,7 @@ }, { "path": "room_bedroom.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -31,7 +31,7 @@ }, { "path": "room_chapel.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -41,7 +41,7 @@ }, { "path": "room_class.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -51,7 +51,7 @@ }, { "path": "room_computer.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -61,7 +61,7 @@ }, { "path": "room_conference.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -71,7 +71,7 @@ }, { "path": "room_crypt.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -81,7 +81,7 @@ }, { "path": "room_kitchen.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -91,7 +91,7 @@ }, { "path": "room_laboratory.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -101,7 +101,7 @@ }, { "path": "room_library.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -111,7 +111,7 @@ }, { "path": "room_locker.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -121,7 +121,7 @@ }, { "path": "room_nursery.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -131,7 +131,7 @@ }, { "path": "room_office.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -141,7 +141,7 @@ }, { "path": "room_prison_cell.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -151,7 +151,7 @@ }, { "path": "room_restaurant.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -161,7 +161,7 @@ }, { "path": "room_security_check.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -171,7 +171,7 @@ }, { "path": "room_sport.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -181,7 +181,7 @@ }, { "path": "room_storage.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -191,7 +191,7 @@ }, { "path": "room_technical.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -201,7 +201,7 @@ }, { "path": "room_toilets.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], @@ -211,7 +211,7 @@ }, { "path": "room_waiting.svg", - "license": "GNU", + "license": "AGPL-3.0-only", "authors": [ "Adrien Pavie" ], diff --git a/assets/layers/indoors/room_administration.svg.license b/assets/layers/indoors/room_administration.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_administration.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_auditorium.svg.license b/assets/layers/indoors/room_auditorium.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_auditorium.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_bedroom.svg.license b/assets/layers/indoors/room_bedroom.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_bedroom.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_chapel.svg.license b/assets/layers/indoors/room_chapel.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_chapel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_class.svg.license b/assets/layers/indoors/room_class.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_class.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_computer.svg.license b/assets/layers/indoors/room_computer.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_computer.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_conference.svg.license b/assets/layers/indoors/room_conference.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_conference.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_crypt.svg.license b/assets/layers/indoors/room_crypt.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_crypt.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_kitchen.svg.license b/assets/layers/indoors/room_kitchen.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_kitchen.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_laboratory.svg.license b/assets/layers/indoors/room_laboratory.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_laboratory.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_library.svg.license b/assets/layers/indoors/room_library.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_library.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_locker.svg.license b/assets/layers/indoors/room_locker.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_locker.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_nursery.svg.license b/assets/layers/indoors/room_nursery.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_nursery.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_office.svg.license b/assets/layers/indoors/room_office.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_office.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_prison_cell.svg.license b/assets/layers/indoors/room_prison_cell.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_prison_cell.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_restaurant.svg.license b/assets/layers/indoors/room_restaurant.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_restaurant.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_security_check.svg.license b/assets/layers/indoors/room_security_check.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_security_check.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_sport.svg.license b/assets/layers/indoors/room_sport.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_sport.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_storage.svg.license b/assets/layers/indoors/room_storage.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_storage.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_technical.svg.license b/assets/layers/indoors/room_technical.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_technical.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_toilets.svg.license b/assets/layers/indoors/room_toilets.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_toilets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/indoors/room_waiting.svg.license b/assets/layers/indoors/room_waiting.svg.license new file mode 100644 index 000000000..c5c81c4e6 --- /dev/null +++ b/assets/layers/indoors/room_waiting.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie +SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/assets/layers/information_board/board.svg.license b/assets/layers/information_board/board.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/information_board/board.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kerbs/KerbIcon.svg.license b/assets/layers/kerbs/KerbIcon.svg.license new file mode 100644 index 000000000..221cb9eb4 --- /dev/null +++ b/assets/layers/kerbs/KerbIcon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Treeem +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kerbs/flush.svg.license b/assets/layers/kerbs/flush.svg.license new file mode 100644 index 000000000..9ee7b8549 --- /dev/null +++ b/assets/layers/kerbs/flush.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jeroen Hoek +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kerbs/lowered.svg.license b/assets/layers/kerbs/lowered.svg.license new file mode 100644 index 000000000..9ee7b8549 --- /dev/null +++ b/assets/layers/kerbs/lowered.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jeroen Hoek +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kerbs/no.svg.license b/assets/layers/kerbs/no.svg.license new file mode 100644 index 000000000..9ee7b8549 --- /dev/null +++ b/assets/layers/kerbs/no.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jeroen Hoek +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kerbs/raised.svg.license b/assets/layers/kerbs/raised.svg.license new file mode 100644 index 000000000..9ee7b8549 --- /dev/null +++ b/assets/layers/kerbs/raised.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jeroen Hoek +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/childcare.svg.license b/assets/layers/kindergarten_childcare/childcare.svg.license new file mode 100644 index 000000000..20616f552 --- /dev/null +++ b/assets/layers/kindergarten_childcare/childcare.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Diego Naive +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/kindergarten.svg.license b/assets/layers/kindergarten_childcare/kindergarten.svg.license new file mode 100644 index 000000000..5f03c70c7 --- /dev/null +++ b/assets/layers/kindergarten_childcare/kindergarten.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Diego Naive; VideoPlasty; Pietervdvn +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/map/map-stickered.svg.license b/assets/layers/map/map-stickered.svg.license new file mode 100644 index 000000000..e2b956068 --- /dev/null +++ b/assets/layers/map/map-stickered.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenStreetMap; Pieter Vander Vennet; M!dgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/map/map.svg.license b/assets/layers/map/map.svg.license new file mode 100644 index 000000000..d3e015ece --- /dev/null +++ b/assets/layers/map/map.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/map/osm-logo-buggy-attr.svg.license b/assets/layers/map/osm-logo-buggy-attr.svg.license new file mode 100644 index 000000000..d3e015ece --- /dev/null +++ b/assets/layers/map/osm-logo-buggy-attr.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/map/osm-logo-white-bg.svg.license b/assets/layers/map/osm-logo-white-bg.svg.license new file mode 100644 index 000000000..d3e015ece --- /dev/null +++ b/assets/layers/map/osm-logo-white-bg.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/maproulette/logomark.svg.license b/assets/layers/maproulette/logomark.svg.license new file mode 100644 index 000000000..8a035dcb9 --- /dev/null +++ b/assets/layers/maproulette/logomark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MapRoulette +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/layers/maxspeed/living_street_be.svg.license b/assets/layers/maxspeed/living_street_be.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/maxspeed/living_street_be.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/memorial/plaque.svg.license b/assets/layers/memorial/plaque.svg.license new file mode 100644 index 000000000..bb226dbab --- /dev/null +++ b/assets/layers/memorial/plaque.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/nature_reserve/ANB.jpg.license b/assets/layers/nature_reserve/ANB.jpg.license new file mode 100644 index 000000000..6d48803f7 --- /dev/null +++ b/assets/layers/nature_reserve/ANB.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Agentschap Natuur en Bos +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/nature_reserve/Natuurpunt.jpg.license b/assets/layers/nature_reserve/Natuurpunt.jpg.license new file mode 100644 index 000000000..17b956445 --- /dev/null +++ b/assets/layers/nature_reserve/Natuurpunt.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Natuurpunt +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ 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 new file mode 100644 index 000000000..537a9d776 --- /dev/null +++ b/assets/layers/nature_reserve/groen_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Groen +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/layers/nature_reserve/nature_reserve.svg.license b/assets/layers/nature_reserve/nature_reserve.svg.license new file mode 100644 index 000000000..1ebbefa58 --- /dev/null +++ b/assets/layers/nature_reserve/nature_reserve.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @ Эдуард Черных +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/observation_tower/Tower_observation.svg.license b/assets/layers/observation_tower/Tower_observation.svg.license new file mode 100644 index 000000000..260a65abb --- /dev/null +++ b/assets/layers/observation_tower/Tower_observation.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Teslaton +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/osm_community_index/license_info.json b/assets/layers/osm_community_index/license_info.json index d0c1f83df..b73e21ee0 100644 --- a/assets/layers/osm_community_index/license_info.json +++ b/assets/layers/osm_community_index/license_info.json @@ -1,7 +1,7 @@ [ { "path": "osm.svg", - "license": "ISC-LICENSE", + "license": "ISC", "authors": [ "osmlab" ], diff --git a/assets/layers/osm_community_index/osm.svg.license b/assets/layers/osm_community_index/osm.svg.license new file mode 100644 index 000000000..11884bd00 --- /dev/null +++ b/assets/layers/osm_community_index/osm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: osmlab +SPDX-License-Identifier: ISC \ No newline at end of file diff --git a/assets/layers/parcel_lockers/parcel_lockers.svg.license b/assets/layers/parcel_lockers/parcel_lockers.svg.license new file mode 100644 index 000000000..1c04d361d --- /dev/null +++ b/assets/layers/parcel_lockers/parcel_lockers.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Emmanuel Darmon; Noun Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/parking/parking.svg.license b/assets/layers/parking/parking.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/layers/parking/parking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/parking_spaces/parking_space.svg.license b/assets/layers/parking_spaces/parking_space.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/parking_spaces/parking_space.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/parking_ticket_machine/parking_tickets.svg.license b/assets/layers/parking_ticket_machine/parking_tickets.svg.license new file mode 100644 index 000000000..a342db9b9 --- /dev/null +++ b/assets/layers/parking_ticket_machine/parking_tickets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jérémy Ragusa +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/pharmacy/pharmacy.svg.license b/assets/layers/pharmacy/pharmacy.svg.license new file mode 100644 index 000000000..4ea4f6891 --- /dev/null +++ b/assets/layers/pharmacy/pharmacy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM-carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/physiotherapist/doctors.svg.license b/assets/layers/physiotherapist/doctors.svg.license new file mode 100644 index 000000000..a48fd496b --- /dev/null +++ b/assets/layers/physiotherapist/doctors.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: osmcarto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/picnic_table/picnic_table.svg.license b/assets/layers/picnic_table/picnic_table.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/picnic_table/picnic_table.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/play_forest/icon.svg.license b/assets/layers/play_forest/icon.svg.license new file mode 100644 index 000000000..0b32f5548 --- /dev/null +++ b/assets/layers/play_forest/icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Agentschap Natuur en Bos +SPDX-License-Identifier: ? \ No newline at end of file diff --git a/assets/layers/postboxes/postbox.svg.license b/assets/layers/postboxes/postbox.svg.license new file mode 100644 index 000000000..f33e45616 --- /dev/null +++ b/assets/layers/postboxes/postbox.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Vincent Le Moign; https://twitter.com/webalys +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/postoffices/post_office.svg.license b/assets/layers/postoffices/post_office.svg.license new file mode 100644 index 000000000..34b9169ea --- /dev/null +++ b/assets/layers/postoffices/post_office.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://github.com/emojione/emojione/graphs/contributors +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/questions/100euro.svg.license b/assets/layers/questions/100euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/100euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/10cent.svg.license b/assets/layers/questions/10cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/10cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/10euro.svg.license b/assets/layers/questions/10euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/10euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/1cent.svg.license b/assets/layers/questions/1cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/1cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/1euro.svg.license b/assets/layers/questions/1euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/1euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/200euro.svg.license b/assets/layers/questions/200euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/200euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/20cent.svg.license b/assets/layers/questions/20cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/20cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/20euro.svg.license b/assets/layers/questions/20euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/20euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/2cent.svg.license b/assets/layers/questions/2cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/2cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/2euro.svg.license b/assets/layers/questions/2euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/2euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/500euro.svg.license b/assets/layers/questions/500euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/500euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/50cent.svg.license b/assets/layers/questions/50cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/50cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/50euro.svg.license b/assets/layers/questions/50euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/50euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/5cent.svg.license b/assets/layers/questions/5cent.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/5cent.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/5euro.svg.license b/assets/layers/questions/5euro.svg.license new file mode 100644 index 000000000..854d8a8df --- /dev/null +++ b/assets/layers/questions/5euro.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipart; frankes +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/audio_induction_loop.svg.license b/assets/layers/questions/audio_induction_loop.svg.license new file mode 100644 index 000000000..56472b238 --- /dev/null +++ b/assets/layers/questions/audio_induction_loop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Carl Holderness +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/questions/audio_induction_loop_missing.svg.license b/assets/layers/questions/audio_induction_loop_missing.svg.license new file mode 100644 index 000000000..56472b238 --- /dev/null +++ b/assets/layers/questions/audio_induction_loop_missing.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Carl Holderness +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/questions/cash.svg.license b/assets/layers/questions/cash.svg.license new file mode 100644 index 000000000..0235d4584 --- /dev/null +++ b/assets/layers/questions/cash.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Online Web Fonts +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/questions/coins.svg.license b/assets/layers/questions/coins.svg.license new file mode 100644 index 000000000..0235d4584 --- /dev/null +++ b/assets/layers/questions/coins.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Online Web Fonts +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/questions/nfc_card.svg.license b/assets/layers/questions/nfc_card.svg.license new file mode 100644 index 000000000..681a0f5e3 --- /dev/null +++ b/assets/layers/questions/nfc_card.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Stijn Wens +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/no_smoking.svg.license b/assets/layers/questions/no_smoking.svg.license new file mode 100644 index 000000000..c44973d7b --- /dev/null +++ b/assets/layers/questions/no_smoking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: AIGA +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/notes.svg.license b/assets/layers/questions/notes.svg.license new file mode 100644 index 000000000..0235d4584 --- /dev/null +++ b/assets/layers/questions/notes.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Online Web Fonts +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/questions/payment_card.svg.license b/assets/layers/questions/payment_card.svg.license new file mode 100644 index 000000000..38cc3d091 --- /dev/null +++ b/assets/layers/questions/payment_card.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maxi Koichi (maxixam) +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/questions/phone.svg.license b/assets/layers/questions/phone.svg.license new file mode 100644 index 000000000..bc3d5e8a1 --- /dev/null +++ b/assets/layers/questions/phone.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @ tyskrat +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/questions/qrcode.svg.license b/assets/layers/questions/qrcode.svg.license new file mode 100644 index 000000000..3227d1393 --- /dev/null +++ b/assets/layers/questions/qrcode.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Ionic Team +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/layers/questions/send_email.svg.license b/assets/layers/questions/send_email.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/layers/questions/send_email.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/layers/questions/smartphone.svg.license b/assets/layers/questions/smartphone.svg.license new file mode 100644 index 000000000..9e89f1927 --- /dev/null +++ b/assets/layers/questions/smartphone.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: To Uyen +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/questions/smoking.svg.license b/assets/layers/questions/smoking.svg.license new file mode 100644 index 000000000..af79de051 --- /dev/null +++ b/assets/layers/questions/smoking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Wiki-User03; ZooFari +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/reception_desk/reception_desk.svg.license b/assets/layers/reception_desk/reception_desk.svg.license new file mode 100644 index 000000000..a6ab2404f --- /dev/null +++ b/assets/layers/reception_desk/reception_desk.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin Julien +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/batteries.svg.license b/assets/layers/recycling/batteries.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/batteries.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/beverage_cartons.svg.license b/assets/layers/recycling/beverage_cartons.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/beverage_cartons.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/bicycles.svg.license b/assets/layers/recycling/bicycles.svg.license new file mode 100644 index 000000000..967c3cdb3 --- /dev/null +++ b/assets/layers/recycling/bicycles.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Antwerpenize Bike Font +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/recycling/cans.svg.license b/assets/layers/recycling/cans.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/cans.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/clothes.svg.license b/assets/layers/recycling/clothes.svg.license new file mode 100644 index 000000000..ad0574631 --- /dev/null +++ b/assets/layers/recycling/clothes.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Adrien Pavie; modified from EmojiOne 2: U+1F456, U+1F45 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/cooking_oil.svg.license b/assets/layers/recycling/cooking_oil.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/cooking_oil.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/engine_oil.svg.license b/assets/layers/recycling/engine_oil.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/engine_oil.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/fluorescent_tubes.svg.license b/assets/layers/recycling/fluorescent_tubes.svg.license new file mode 100644 index 000000000..31bb017ff --- /dev/null +++ b/assets/layers/recycling/fluorescent_tubes.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Noun Project; shashank singh +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/garden_waste.svg.license b/assets/layers/recycling/garden_waste.svg.license new file mode 100644 index 000000000..1979dc5d7 --- /dev/null +++ b/assets/layers/recycling/garden_waste.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick; modified from Twemoji: U+1F33F +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/glass.svg.license b/assets/layers/recycling/glass.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/glass.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/glass_bottles.svg.license b/assets/layers/recycling/glass_bottles.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/glass_bottles.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/light_bulbs.svg.license b/assets/layers/recycling/light_bulbs.svg.license new file mode 100644 index 000000000..6b4e1fec2 --- /dev/null +++ b/assets/layers/recycling/light_bulbs.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenClipArt; fabiovaleggia +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/recycling/needles.svg.license b/assets/layers/recycling/needles.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/recycling/needles.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/recycling/newspaper.svg.license b/assets/layers/recycling/newspaper.svg.license new file mode 100644 index 000000000..de3375f52 --- /dev/null +++ b/assets/layers/recycling/newspaper.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick; modified from EmojiOne 2: U+1F4F0 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/paper.svg.license b/assets/layers/recycling/paper.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/paper.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/plastic.svg.license b/assets/layers/recycling/plastic.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/plastic.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/plastic_bottles.svg.license b/assets/layers/recycling/plastic_bottles.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/plastic_bottles.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/plastic_packaging.svg.license b/assets/layers/recycling/plastic_packaging.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/plastic_packaging.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/printer_cartridges.svg.license b/assets/layers/recycling/printer_cartridges.svg.license new file mode 100644 index 000000000..e029be46b --- /dev/null +++ b/assets/layers/recycling/printer_cartridges.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Noun Project; Zach Bogart +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/recycling-14.svg.license b/assets/layers/recycling/recycling-14.svg.license new file mode 100644 index 000000000..1d5f5ba88 --- /dev/null +++ b/assets/layers/recycling/recycling-14.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Michael Glanznig +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/recycling/scrap_metal.svg.license b/assets/layers/recycling/scrap_metal.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/layers/recycling/scrap_metal.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/shoes.svg.license b/assets/layers/recycling/shoes.svg.license new file mode 100644 index 000000000..fc120ee71 --- /dev/null +++ b/assets/layers/recycling/shoes.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick; modified from EmojiOne 2: U+1F45F +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/small_electrical_appliances.svg.license b/assets/layers/recycling/small_electrical_appliances.svg.license new file mode 100644 index 000000000..992cbeb7a --- /dev/null +++ b/assets/layers/recycling/small_electrical_appliances.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: EmojiOne 2: U+1F50C +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/school/college.svg.license b/assets/layers/school/college.svg.license new file mode 100644 index 000000000..0cf6926f1 --- /dev/null +++ b/assets/layers/school/college.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/school/school.svg.license b/assets/layers/school/school.svg.license new file mode 100644 index 000000000..fd4c1d0ed --- /dev/null +++ b/assets/layers/school/school.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/shelter/shelter.svg.license b/assets/layers/shelter/shelter.svg.license new file mode 100644 index 000000000..2bb90be55 --- /dev/null +++ b/assets/layers/shelter/shelter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Diemen Design +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/layers/shops/shop-disused.svg.license b/assets/layers/shops/shop-disused.svg.license new file mode 100644 index 000000000..f05007a5f --- /dev/null +++ b/assets/layers/shops/shop-disused.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki icon set; Pietervdvn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/shower/shower.svg.license b/assets/layers/shower/shower.svg.license new file mode 100644 index 000000000..4cda70159 --- /dev/null +++ b/assets/layers/shower/shower.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: James +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/slow_roads/slow_road.svg.license b/assets/layers/slow_roads/slow_road.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/slow_roads/slow_road.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/slow_roads/woonerf.svg.license b/assets/layers/slow_roads/woonerf.svg.license new file mode 100644 index 000000000..af0d44d5b --- /dev/null +++ b/assets/layers/slow_roads/woonerf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Belgische Wetgever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/speed_camera/speed_camera.svg.license b/assets/layers/speed_camera/speed_camera.svg.license new file mode 100644 index 000000000..7cd5feff1 --- /dev/null +++ b/assets/layers/speed_camera/speed_camera.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Earlyswerver; OpenClipArt +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/speed_display/speed_display.svg.license b/assets/layers/speed_display/speed_display.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/speed_display/speed_display.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/baseball.svg.license b/assets/layers/sport_pitch/baseball.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/baseball.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/basketball.svg.license b/assets/layers/sport_pitch/basketball.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/basketball.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/beachvolleyball.svg.license b/assets/layers/sport_pitch/beachvolleyball.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/beachvolleyball.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/boules.svg.license b/assets/layers/sport_pitch/boules.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/boules.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/equestrian.svg.license b/assets/layers/sport_pitch/equestrian.svg.license new file mode 100644 index 000000000..3e50fc104 --- /dev/null +++ b/assets/layers/sport_pitch/equestrian.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hufkratzer +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/lock.svg.license b/assets/layers/sport_pitch/lock.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/lock.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/skateboard.svg.license b/assets/layers/sport_pitch/skateboard.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/skateboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/soccer.svg.license b/assets/layers/sport_pitch/soccer.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/soccer.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/sport_pitch.svg.license b/assets/layers/sport_pitch/sport_pitch.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/sport_pitch.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/table_tennis.svg.license b/assets/layers/sport_pitch/table_tennis.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/table_tennis.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/tennis.svg.license b/assets/layers/sport_pitch/tennis.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/tennis.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sport_pitch/volleyball.svg.license b/assets/layers/sport_pitch/volleyball.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/layers/sport_pitch/volleyball.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/sports_centre/sports_centre.svg.license b/assets/layers/sports_centre/sports_centre.svg.license new file mode 100644 index 000000000..23abff05b --- /dev/null +++ b/assets/layers/sports_centre/sports_centre.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hello world; The Noun Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/stairs/Braille_stairs.jpg.license b/assets/layers/stairs/Braille_stairs.jpg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/stairs/Braille_stairs.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/street_lamps/bent_pole_1.svg.license b/assets/layers/street_lamps/bent_pole_1.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/street_lamps/bent_pole_1.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/street_lamps/bent_pole_2.svg.license b/assets/layers/street_lamps/bent_pole_2.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/street_lamps/bent_pole_2.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/street_lamps/straight_pole.svg.license b/assets/layers/street_lamps/straight_pole.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/street_lamps/straight_pole.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/street_lamps/street_lamp.svg.license b/assets/layers/street_lamps/street_lamp.svg.license new file mode 100644 index 000000000..72dee4bdf --- /dev/null +++ b/assets/layers/street_lamps/street_lamp.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Yohan Boniface +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/toilet/toilets.svg.license b/assets/layers/toilet/toilets.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/toilet/toilets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/toilet/urinal.svg.license b/assets/layers/toilet/urinal.svg.license new file mode 100644 index 000000000..1fa53f27f --- /dev/null +++ b/assets/layers/toilet/urinal.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: asianson.design; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/toilet/wheelchair.svg.license b/assets/layers/toilet/wheelchair.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/toilet/wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/trail/pushchair.svg.license b/assets/layers/trail/pushchair.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/layers/trail/pushchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/trail/trail.svg.license b/assets/layers/trail/trail.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/layers/trail/trail.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/trail/wheelchair.svg.license b/assets/layers/trail/wheelchair.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/trail/wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/transit_stops/bus_stop.svg.license b/assets/layers/transit_stops/bus_stop.svg.license new file mode 100644 index 000000000..bca82aa38 --- /dev/null +++ b/assets/layers/transit_stops/bus_stop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andy Allan; Michael Glanznig; Paul Norman; Paul Dicker +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license b/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license new file mode 100644 index 000000000..430fa0ae0 --- /dev/null +++ b/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: M!dgard +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/tree_node/broadleaved.svg.license b/assets/layers/tree_node/broadleaved.svg.license new file mode 100644 index 000000000..e288ab760 --- /dev/null +++ b/assets/layers/tree_node/broadleaved.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Midgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/tree_node/leafless.svg.license b/assets/layers/tree_node/leafless.svg.license new file mode 100644 index 000000000..e288ab760 --- /dev/null +++ b/assets/layers/tree_node/leafless.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Midgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/tree_node/needleleaved.svg.license b/assets/layers/tree_node/needleleaved.svg.license new file mode 100644 index 000000000..e288ab760 --- /dev/null +++ b/assets/layers/tree_node/needleleaved.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Midgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/tree_node/unknown.svg.license b/assets/layers/tree_node/unknown.svg.license new file mode 100644 index 000000000..e288ab760 --- /dev/null +++ b/assets/layers/tree_node/unknown.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Midgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/usersettings/translate_disabled.svg.license b/assets/layers/usersettings/translate_disabled.svg.license new file mode 100644 index 000000000..66a5029b5 --- /dev/null +++ b/assets/layers/usersettings/translate_disabled.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MGalloway (WMF) +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/layers/usersettings/translate_mobile.svg.license b/assets/layers/usersettings/translate_mobile.svg.license new file mode 100644 index 000000000..87329559a --- /dev/null +++ b/assets/layers/usersettings/translate_mobile.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MGalloway (WMF); @ tyskrat +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/cow.svg.license b/assets/layers/vending_machine/cow.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/vending_machine/cow.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/egg.svg.license b/assets/layers/vending_machine/egg.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/vending_machine/egg.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/honey.svg.license b/assets/layers/vending_machine/honey.svg.license new file mode 100644 index 000000000..d06b8675a --- /dev/null +++ b/assets/layers/vending_machine/honey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mushki Brichta +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/mug-saucer.svg.license b/assets/layers/vending_machine/mug-saucer.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/vending_machine/mug-saucer.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/potato.svg.license b/assets/layers/vending_machine/potato.svg.license new file mode 100644 index 000000000..a54985a2c --- /dev/null +++ b/assets/layers/vending_machine/potato.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pavel Melnikov; The Noun Project +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/smoking.svg.license b/assets/layers/vending_machine/smoking.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/vending_machine/smoking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/utensils.svg.license b/assets/layers/vending_machine/utensils.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/layers/vending_machine/utensils.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/vending_machine/vending_machine.svg.license b/assets/layers/vending_machine/vending_machine.svg.license new file mode 100644 index 000000000..9290f0914 --- /dev/null +++ b/assets/layers/vending_machine/vending_machine.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Vectorportal.com +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/veterinary/vet.svg.license b/assets/layers/veterinary/vet.svg.license new file mode 100644 index 000000000..13ab13ddd --- /dev/null +++ b/assets/layers/veterinary/vet.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Niels Elgaard Larsen; Tim Hitchins +SPDX-License-Identifier: PD \ No newline at end of file diff --git a/assets/layers/viewpoint/viewpoint.svg.license b/assets/layers/viewpoint/viewpoint.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/layers/viewpoint/viewpoint.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/visitor_information_centre/information.svg.license b/assets/layers/visitor_information_centre/information.svg.license new file mode 100644 index 000000000..76d729065 --- /dev/null +++ b/assets/layers/visitor_information_centre/information.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bobarino +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.png.license b/assets/layers/walls_and_buildings/walls_and_buildings.png.license new file mode 100644 index 000000000..0672222fb --- /dev/null +++ b/assets/layers/walls_and_buildings/walls_and_buildings.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/waste_disposal/waste_disposal.svg.license b/assets/layers/waste_disposal/waste_disposal.svg.license new file mode 100644 index 000000000..b94d79920 --- /dev/null +++ b/assets/layers/waste_disposal/waste_disposal.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: kocio-pl +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/SocialImageForeground.svg.license b/assets/svg/SocialImageForeground.svg.license new file mode 100644 index 000000000..0874c6a78 --- /dev/null +++ b/assets/svg/SocialImageForeground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/add.svg.license b/assets/svg/add.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/add.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/addSmall.svg.license b/assets/svg/addSmall.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/addSmall.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/add_pin.svg.license b/assets/svg/add_pin.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/add_pin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/back.svg.license b/assets/svg/back.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/back.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/blocked.svg.license b/assets/svg/blocked.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/blocked.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/brick_wall_raw.svg.license b/assets/svg/brick_wall_raw.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/brick_wall_raw.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/brick_wall_round.svg.license b/assets/svg/brick_wall_round.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/brick_wall_round.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/brick_wall_square.svg.license b/assets/svg/brick_wall_square.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/brick_wall_square.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/bug.svg.license b/assets/svg/bug.svg.license new file mode 100644 index 000000000..2f60c3c62 --- /dev/null +++ b/assets/svg/bug.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Github +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/svg/camera-plus.svg.license b/assets/svg/camera-plus.svg.license new file mode 100644 index 000000000..e1ba6164a --- /dev/null +++ b/assets/svg/camera-plus.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Dave Gandy; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/svg/checkmark.svg.license b/assets/svg/checkmark.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/checkmark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/circle.svg.license b/assets/svg/circle.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/circle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/clock.svg.license b/assets/svg/clock.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/clock.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +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 new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/close.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/community.svg.license b/assets/svg/community.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/community.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/compass.svg.license b/assets/svg/compass.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/compass.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/confirm.svg.license b/assets/svg/confirm.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/confirm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/copyright.svg.license b/assets/svg/copyright.svg.license new file mode 100644 index 000000000..6c76200c9 --- /dev/null +++ b/assets/svg/copyright.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hannah Declerck +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/cross_bottom_right.svg.license b/assets/svg/cross_bottom_right.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/cross_bottom_right.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair-locked.svg.license b/assets/svg/crosshair-locked.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/crosshair-locked.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair.svg.license b/assets/svg/crosshair.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/crosshair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/delete_icon.svg.license b/assets/svg/delete_icon.svg.license new file mode 100644 index 000000000..fd6b803c6 --- /dev/null +++ b/assets/svg/delete_icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Dave Gandy +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/delete_not_allowed.svg.license b/assets/svg/delete_not_allowed.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/delete_not_allowed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/direction_gradient.svg.license b/assets/svg/direction_gradient.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/direction_gradient.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/direction_stroke.svg.license b/assets/svg/direction_stroke.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/direction_stroke.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/download.svg.license b/assets/svg/download.svg.license new file mode 100644 index 000000000..87be97fae --- /dev/null +++ b/assets/svg/download.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Engr.eponce +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/duplicate.svg.license b/assets/svg/duplicate.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/duplicate.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/elevator.svg.license b/assets/svg/elevator.svg.license new file mode 100644 index 000000000..9b65e1cc5 --- /dev/null +++ b/assets/svg/elevator.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Yveltal +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/elevator_wheelchair.svg.license b/assets/svg/elevator_wheelchair.svg.license new file mode 100644 index 000000000..a6ab2404f --- /dev/null +++ b/assets/svg/elevator_wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin Julien +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/svg/envelope.svg.license b/assets/svg/envelope.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/envelope.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/eye.svg.license b/assets/svg/eye.svg.license new file mode 100644 index 000000000..72a36e071 --- /dev/null +++ b/assets/svg/eye.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Dave Gandy +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/svg/filter.svg.license b/assets/svg/filter.svg.license new file mode 100644 index 000000000..6c76200c9 --- /dev/null +++ b/assets/svg/filter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hannah Declerck +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/filter_disable.svg.license b/assets/svg/filter_disable.svg.license new file mode 100644 index 000000000..6c76200c9 --- /dev/null +++ b/assets/svg/filter_disable.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hannah Declerck +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/floppy.svg.license b/assets/svg/floppy.svg.license new file mode 100644 index 000000000..f2ddd3669 --- /dev/null +++ b/assets/svg/floppy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The Tango! Desktop Project +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gear.svg.license b/assets/svg/gear.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/gear.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/gender_bi.svg.license b/assets/svg/gender_bi.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_bi.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gender_female.svg.license b/assets/svg/gender_female.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_female.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gender_inter.svg.license b/assets/svg/gender_inter.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_inter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gender_male.svg.license b/assets/svg/gender_male.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_male.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gender_queer.svg.license b/assets/svg/gender_queer.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_queer.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gender_trans.svg.license b/assets/svg/gender_trans.svg.license new file mode 100644 index 000000000..b3af262c3 --- /dev/null +++ b/assets/svg/gender_trans.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gender Icon Pack +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/generic_map.svg.license b/assets/svg/generic_map.svg.license new file mode 100644 index 000000000..d091bc6eb --- /dev/null +++ b/assets/svg/generic_map.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Svg Repo +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/gps_arrow.svg.license b/assets/svg/gps_arrow.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/gps_arrow.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/hand.svg.license b/assets/svg/hand.svg.license new file mode 100644 index 000000000..618c335fc --- /dev/null +++ b/assets/svg/hand.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Anomie +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/help.svg.license b/assets/svg/help.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/help.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/home.svg.license b/assets/svg/home.svg.license new file mode 100644 index 000000000..b7429cf75 --- /dev/null +++ b/assets/svg/home.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Timothy Miller +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/svg/invalid.svg.license b/assets/svg/invalid.svg.license new file mode 100644 index 000000000..3b14d8248 --- /dev/null +++ b/assets/svg/invalid.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/josm_logo.svg.license b/assets/svg/josm_logo.svg.license new file mode 100644 index 000000000..f7d6a57b3 --- /dev/null +++ b/assets/svg/josm_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: JOSM Team +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/layers.svg.license b/assets/svg/layers.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/layers.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/length-crosshair.svg.license b/assets/svg/length-crosshair.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/length-crosshair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/liberapay.svg.license b/assets/svg/liberapay.svg.license new file mode 100644 index 000000000..19f94b865 --- /dev/null +++ b/assets/svg/liberapay.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: LiberaPay +SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 7a9540888..58615ac1e 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -395,7 +395,7 @@ }, { "path": "eye.svg", - "license": "CC-BY-SA-3.0-UNPORTED", + "license": "CC-BY-SA-3.0", "authors": [ "Dave Gandy" ], @@ -817,7 +817,7 @@ }, { "path": "move.svg", - "license": "CC-BY-SA-3.0-UNPORTED", + "license": "CC-BY-SA-3.0", "authors": [ "MGalloway (WMF)" ], @@ -1233,7 +1233,7 @@ }, { "path": "teardrop_with_hole_green.svg", - "license": "CREATIVE-COMMONS-4.0-BY-NC", + "license": "CC-BY-NC-4.0", "authors": [], "sources": [ "https://pngimg.com/image/46283" diff --git a/assets/svg/loading.svg.license b/assets/svg/loading.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/loading.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/location-empty.svg.license b/assets/svg/location-empty.svg.license new file mode 100644 index 000000000..c2bdd116b --- /dev/null +++ b/assets/svg/location-empty.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pol Labaut +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/location-refused.svg.license b/assets/svg/location-refused.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/location-refused.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/location.svg.license b/assets/svg/location.svg.license new file mode 100644 index 000000000..6c76200c9 --- /dev/null +++ b/assets/svg/location.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Hannah Declerck +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/location_locked.svg.license b/assets/svg/location_locked.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/location_locked.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/location_unlocked.svg.license b/assets/svg/location_unlocked.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/location_unlocked.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/login.svg.license b/assets/svg/login.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/login.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/logo.svg.license b/assets/svg/logo.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/logout.svg.license b/assets/svg/logout.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/logout.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/mapcomplete_logo.svg.license b/assets/svg/mapcomplete_logo.svg.license new file mode 100644 index 000000000..cc023575a --- /dev/null +++ b/assets/svg/mapcomplete_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet; OSM +SPDX-License-Identifier: LOGO; 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 new file mode 100644 index 000000000..7b259f1c7 --- /dev/null +++ b/assets/svg/mapillary.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mapillary +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/svg/mapillary_black.svg.license b/assets/svg/mapillary_black.svg.license new file mode 100644 index 000000000..7b259f1c7 --- /dev/null +++ b/assets/svg/mapillary_black.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mapillary +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/svg/mastodon.svg.license b/assets/svg/mastodon.svg.license new file mode 100644 index 000000000..3aa2f9625 --- /dev/null +++ b/assets/svg/mastodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mastodon +SPDX-License-Identifier: LOGO; GNU-AFFERO-GENERAL-PUBLIC-LICENSE \ No newline at end of file diff --git a/assets/svg/min.svg.license b/assets/svg/min.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/min.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/move-arrows.svg.license b/assets/svg/move-arrows.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/move-arrows.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/move.svg.license b/assets/svg/move.svg.license new file mode 100644 index 000000000..66a5029b5 --- /dev/null +++ b/assets/svg/move.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MGalloway (WMF) +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/svg/move_confirm.svg.license b/assets/svg/move_confirm.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/move_confirm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/move_not_allowed.svg.license b/assets/svg/move_not_allowed.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/move_not_allowed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/no_checkmark.svg.license b/assets/svg/no_checkmark.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/no_checkmark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/none.svg.license b/assets/svg/none.svg.license new file mode 100644 index 000000000..0dedec0e0 --- /dev/null +++ b/assets/svg/none.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: TRIVIAL \ No newline at end of file diff --git a/assets/svg/not_found.svg.license b/assets/svg/not_found.svg.license new file mode 100644 index 000000000..3b14d8248 --- /dev/null +++ b/assets/svg/not_found.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/note.svg.license b/assets/svg/note.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/note.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/osm-logo-us.svg.license b/assets/svg/osm-logo-us.svg.license new file mode 100644 index 000000000..0b7a3e969 --- /dev/null +++ b/assets/svg/osm-logo-us.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OpenStreetMap U.S. Chapter +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/svg/osm-logo.svg.license b/assets/svg/osm-logo.svg.license new file mode 100644 index 000000000..6f3e18813 --- /dev/null +++ b/assets/svg/osm-logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/svg/party.svg.license b/assets/svg/party.svg.license new file mode 100644 index 000000000..3b14d8248 --- /dev/null +++ b/assets/svg/party.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/pencil.svg.license b/assets/svg/pencil.svg.license new file mode 100644 index 000000000..4b3ea9b5b --- /dev/null +++ b/assets/svg/pencil.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GitHub Octicons +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/svg/person.svg.license b/assets/svg/person.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/person.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/pin.svg.license b/assets/svg/pin.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/pin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/plantnet_logo.svg.license b/assets/svg/plantnet_logo.svg.license new file mode 100644 index 000000000..0cbf3fb72 --- /dev/null +++ b/assets/svg/plantnet_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://plantnet.org +SPDX-License-Identifier: LOGO-(FAIR-USAGE) \ No newline at end of file diff --git a/assets/svg/plus.svg.license b/assets/svg/plus.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/plus.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/pop-out.svg.license b/assets/svg/pop-out.svg.license new file mode 100644 index 000000000..31b6585bf --- /dev/null +++ b/assets/svg/pop-out.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @fatih +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/svg/reload.svg.license b/assets/svg/reload.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/reload.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/relocation.svg.license b/assets/svg/relocation.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/relocation.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/resolved.svg.license b/assets/svg/resolved.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/resolved.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/ring.svg.license b/assets/svg/ring.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/ring.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/robot.svg.license b/assets/svg/robot.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/svg/robot.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/satellite.svg.license b/assets/svg/satellite.svg.license new file mode 100644 index 000000000..02017c5b9 --- /dev/null +++ b/assets/svg/satellite.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: SVG Repo +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/scissors.svg.license b/assets/svg/scissors.svg.license new file mode 100644 index 000000000..59ac2f4cb --- /dev/null +++ b/assets/svg/scissors.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The noun project - Icons8 +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/svg/search.svg.license b/assets/svg/search.svg.license new file mode 100644 index 000000000..b6ad0c1ab --- /dev/null +++ b/assets/svg/search.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OOjs UI Team and other contributors +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/svg/search_disable.svg.license b/assets/svg/search_disable.svg.license new file mode 100644 index 000000000..679a942bb --- /dev/null +++ b/assets/svg/search_disable.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OOjs UI Team and other contributors; Pieter Vander Vennet +SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/assets/svg/share.svg.license b/assets/svg/share.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/share.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/speech_bubble.svg.license b/assets/svg/speech_bubble.svg.license new file mode 100644 index 000000000..3b14d8248 --- /dev/null +++ b/assets/svg/speech_bubble.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/speech_bubble_black_outline.svg.license b/assets/svg/speech_bubble_black_outline.svg.license new file mode 100644 index 000000000..3b14d8248 --- /dev/null +++ b/assets/svg/speech_bubble_black_outline.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/svg/square.svg.license b/assets/svg/square.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/square.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/star.svg.license b/assets/svg/star.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/star.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_half.svg.license b/assets/svg/star_half.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/star_half.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline.svg.license b/assets/svg/star_outline.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/star_outline.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; 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 new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/star_outline_half.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/statistics.svg.license b/assets/svg/statistics.svg.license new file mode 100644 index 000000000..d1b5c1445 --- /dev/null +++ b/assets/svg/statistics.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @felpgrc +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/svg/teardrop.svg.license b/assets/svg/teardrop.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/teardrop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/teardrop_with_hole_green.svg.license b/assets/svg/teardrop_with_hole_green.svg.license new file mode 100644 index 000000000..0c124e452 --- /dev/null +++ b/assets/svg/teardrop_with_hole_green.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC-BY-NC-4.0 \ No newline at end of file diff --git a/assets/svg/translate.svg.license b/assets/svg/translate.svg.license new file mode 100644 index 000000000..66a5029b5 --- /dev/null +++ b/assets/svg/translate.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MGalloway (WMF) +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/svg/triangle.svg.license b/assets/svg/triangle.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/svg/triangle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/up.svg.license b/assets/svg/up.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/svg/up.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/svg/upload.svg.license b/assets/svg/upload.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/upload.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/wikidata.svg.license b/assets/svg/wikidata.svg.license new file mode 100644 index 000000000..811da3ded --- /dev/null +++ b/assets/svg/wikidata.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Wikidata +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/svg/wikimedia-commons-white.svg.license b/assets/svg/wikimedia-commons-white.svg.license new file mode 100644 index 000000000..4151a9346 --- /dev/null +++ b/assets/svg/wikimedia-commons-white.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Wikimedia +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/svg/wikipedia.svg.license b/assets/svg/wikipedia.svg.license new file mode 100644 index 000000000..71774b109 --- /dev/null +++ b/assets/svg/wikipedia.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Wikipedia +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/advertising/AdvertisingColumn_001.jpg.license b/assets/themes/advertising/AdvertisingColumn_001.jpg.license new file mode 100644 index 000000000..2211ce772 --- /dev/null +++ b/assets/themes/advertising/AdvertisingColumn_001.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargs +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/AdvertisingColumn_003.jpg.license b/assets/themes/advertising/AdvertisingColumn_003.jpg.license new file mode 100644 index 000000000..8215bfc74 --- /dev/null +++ b/assets/themes/advertising/AdvertisingColumn_003.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargsed +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/AdvertisingTotem_003.jpg.license b/assets/themes/advertising/AdvertisingTotem_003.jpg.license new file mode 100644 index 000000000..8215bfc74 --- /dev/null +++ b/assets/themes/advertising/AdvertisingTotem_003.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargsed +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/AdvertisingTotem_004.jpg.license b/assets/themes/advertising/AdvertisingTotem_004.jpg.license new file mode 100644 index 000000000..8215bfc74 --- /dev/null +++ b/assets/themes/advertising/AdvertisingTotem_004.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargsed +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Advertising_flag.jpg.license b/assets/themes/advertising/Advertising_flag.jpg.license new file mode 100644 index 000000000..28739b9bf --- /dev/null +++ b/assets/themes/advertising/Advertising_flag.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Sandy B +SPDX-License-Identifier: CC-BY-SA-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/Aircraft_Sculpture.jpg.license b/assets/themes/advertising/Aircraft_Sculpture.jpg.license new file mode 100644 index 000000000..4b784ae21 --- /dev/null +++ b/assets/themes/advertising/Aircraft_Sculpture.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Rod Waddington +SPDX-License-Identifier: CC-BY-SA-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/BS.JPG.license b/assets/themes/advertising/BS.JPG.license new file mode 100644 index 000000000..5740a5c76 --- /dev/null +++ b/assets/themes/advertising/BS.JPG.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: TeWeBs +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Capitol_wall.jpg.license b/assets/themes/advertising/Capitol_wall.jpg.license new file mode 100644 index 000000000..ba644d977 --- /dev/null +++ b/assets/themes/advertising/Capitol_wall.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Artaxerxes +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/City-Light-Poster.jpg.license b/assets/themes/advertising/City-Light-Poster.jpg.license new file mode 100644 index 000000000..5ecdd4336 --- /dev/null +++ b/assets/themes/advertising/City-Light-Poster.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bärwinkel, Klaus +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/FGV_Founding.jpg.license b/assets/themes/advertising/FGV_Founding.jpg.license new file mode 100644 index 000000000..5ddd30287 --- /dev/null +++ b/assets/themes/advertising/FGV_Founding.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Paunofu +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/JR_Central.jpg.license b/assets/themes/advertising/JR_Central.jpg.license new file mode 100644 index 000000000..a241d0c2f --- /dev/null +++ b/assets/themes/advertising/JR_Central.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ジェーアール東海一口株主 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/KFC_Billboard.jpg.license b/assets/themes/advertising/KFC_Billboard.jpg.license new file mode 100644 index 000000000..11ed92d52 --- /dev/null +++ b/assets/themes/advertising/KFC_Billboard.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Paunofu +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/LIDL_Billboard.jpg.license b/assets/themes/advertising/LIDL_Billboard.jpg.license new file mode 100644 index 000000000..c8197eb25 --- /dev/null +++ b/assets/themes/advertising/LIDL_Billboard.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Paul Williams +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Lidl_totem.jpg.license b/assets/themes/advertising/Lidl_totem.jpg.license new file mode 100644 index 000000000..ead3ce7cc --- /dev/null +++ b/assets/themes/advertising/Lidl_totem.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Donald Trung +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Mug.jpg.license b/assets/themes/advertising/Mug.jpg.license new file mode 100644 index 000000000..d56ca0e4b --- /dev/null +++ b/assets/themes/advertising/Mug.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Carol M. Highsmith +SPDX-License-Identifier: PUBLIC-DOMAIN \ No newline at end of file diff --git a/assets/themes/advertising/Mupi_Alcoi.jpg.license b/assets/themes/advertising/Mupi_Alcoi.jpg.license new file mode 100644 index 000000000..11ed92d52 --- /dev/null +++ b/assets/themes/advertising/Mupi_Alcoi.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Paunofu +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Mupi_spain.jpg.license b/assets/themes/advertising/Mupi_spain.jpg.license new file mode 100644 index 000000000..36644b251 --- /dev/null +++ b/assets/themes/advertising/Mupi_spain.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jusotil_1943 +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/advertising/Repsol_Billboard.jpg.license b/assets/themes/advertising/Repsol_Billboard.jpg.license new file mode 100644 index 000000000..11ed92d52 --- /dev/null +++ b/assets/themes/advertising/Repsol_Billboard.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Paunofu +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Screen_poster_box.jpg.license b/assets/themes/advertising/Screen_poster_box.jpg.license new file mode 100644 index 000000000..e3b90078e --- /dev/null +++ b/assets/themes/advertising/Screen_poster_box.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: T. Segonds +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Small_Board.jpg.license b/assets/themes/advertising/Small_Board.jpg.license new file mode 100644 index 000000000..8215bfc74 --- /dev/null +++ b/assets/themes/advertising/Small_Board.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargsed +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Subway_screen.jpg.license b/assets/themes/advertising/Subway_screen.jpg.license new file mode 100644 index 000000000..fb6efa407 --- /dev/null +++ b/assets/themes/advertising/Subway_screen.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Metropolitan Transportation Authority of the State of New York +SPDX-License-Identifier: CC-BY-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/TV_media.jpg.license b/assets/themes/advertising/TV_media.jpg.license new file mode 100644 index 000000000..7288068b2 --- /dev/null +++ b/assets/themes/advertising/TV_media.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Roger Carvell +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/Times square.jpg.license b/assets/themes/advertising/Times square.jpg.license new file mode 100644 index 000000000..5e76f07e5 --- /dev/null +++ b/assets/themes/advertising/Times square.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: chensiyuan +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/Waitrose_sign.jpg.license b/assets/themes/advertising/Waitrose_sign.jpg.license new file mode 100644 index 000000000..a0a0ecf98 --- /dev/null +++ b/assets/themes/advertising/Waitrose_sign.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Geographer +SPDX-License-Identifier: CC-BY-SA-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/billboard.svg.license b/assets/themes/advertising/billboard.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/billboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/board.svg.license b/assets/themes/advertising/board.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/board.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/clarke_wall.jpg.license b/assets/themes/advertising/clarke_wall.jpg.license new file mode 100644 index 000000000..b0ebfedbc --- /dev/null +++ b/assets/themes/advertising/clarke_wall.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Albert Bridge +SPDX-License-Identifier: CC-BY-SA-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/column.svg.license b/assets/themes/advertising/column.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/column.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/farma_sign.jpg.license b/assets/themes/advertising/farma_sign.jpg.license new file mode 100644 index 000000000..95c4dcdb9 --- /dev/null +++ b/assets/themes/advertising/farma_sign.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: paunofu +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/flag.svg.license b/assets/themes/advertising/flag.svg.license new file mode 100644 index 000000000..71d7158ca --- /dev/null +++ b/assets/themes/advertising/flag.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38; Ash Crow; Happy-melon; Aris Katsaris; Pietervdvn +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/icon.svg.license b/assets/themes/advertising/icon.svg.license new file mode 100644 index 000000000..1ea0fcdaa --- /dev/null +++ b/assets/themes/advertising/icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Panier Avide +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/local_Board.jpg.license b/assets/themes/advertising/local_Board.jpg.license new file mode 100644 index 000000000..8215bfc74 --- /dev/null +++ b/assets/themes/advertising/local_Board.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Segnargsed +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/newspaper_kiosk.svg.license b/assets/themes/advertising/newspaper_kiosk.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/newspaper_kiosk.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/poster_box.svg.license b/assets/themes/advertising/poster_box.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/poster_box.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/poster_box_no_support.svg.license b/assets/themes/advertising/poster_box_no_support.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/poster_box_no_support.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/screen alcoi.jpg.license b/assets/themes/advertising/screen alcoi.jpg.license new file mode 100644 index 000000000..c1a2f7ee8 --- /dev/null +++ b/assets/themes/advertising/screen alcoi.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: paunofu +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/screen.svg.license b/assets/themes/advertising/screen.svg.license new file mode 100644 index 000000000..6f37b7b51 --- /dev/null +++ b/assets/themes/advertising/screen.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38; Pietervdvn +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/screen_no_support.svg.license b/assets/themes/advertising/screen_no_support.svg.license new file mode 100644 index 000000000..6f37b7b51 --- /dev/null +++ b/assets/themes/advertising/screen_no_support.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38; Pietervdvn +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/sculpture.svg.license b/assets/themes/advertising/sculpture.svg.license new file mode 100644 index 000000000..4868ceb87 --- /dev/null +++ b/assets/themes/advertising/sculpture.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Nathaniel Smith; Pietervdvn +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/sign.svg.license b/assets/themes/advertising/sign.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/sign.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/sign_EOI.jpg.license b/assets/themes/advertising/sign_EOI.jpg.license new file mode 100644 index 000000000..95c4dcdb9 --- /dev/null +++ b/assets/themes/advertising/sign_EOI.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: paunofu +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/tarp.svg.license b/assets/themes/advertising/tarp.svg.license new file mode 100644 index 000000000..604fe4717 --- /dev/null +++ b/assets/themes/advertising/tarp.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38; Pietervdvn +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/tarp_feder.jpg.license b/assets/themes/advertising/tarp_feder.jpg.license new file mode 100644 index 000000000..95c4dcdb9 --- /dev/null +++ b/assets/themes/advertising/tarp_feder.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: paunofu +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/advertising/tarp_madrid.jpg.license b/assets/themes/advertising/tarp_madrid.jpg.license new file mode 100644 index 000000000..a47e5fe66 --- /dev/null +++ b/assets/themes/advertising/tarp_madrid.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Rogotan +SPDX-License-Identifier: CC-BY-2.0 \ No newline at end of file diff --git a/assets/themes/advertising/totem.svg.license b/assets/themes/advertising/totem.svg.license new file mode 100644 index 000000000..fea8b9c65 --- /dev/null +++ b/assets/themes/advertising/totem.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/trivision.svg.license b/assets/themes/advertising/trivision.svg.license new file mode 100644 index 000000000..8e7df502c --- /dev/null +++ b/assets/themes/advertising/trivision.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: pietervdvn; Louis Dawson (via the Noun Project) +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/advertising/wall_painting.svg.license b/assets/themes/advertising/wall_painting.svg.license new file mode 100644 index 000000000..604fe4717 --- /dev/null +++ b/assets/themes/advertising/wall_painting.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Barnes38; Pietervdvn +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/aed/aed.svg.license b/assets/themes/aed/aed.svg.license new file mode 100644 index 000000000..76674af11 --- /dev/null +++ b/assets/themes/aed/aed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MaxxL +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/artwork/artwork.svg.license b/assets/themes/artwork/artwork.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/themes/artwork/artwork.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/atm/logo.svg.license b/assets/themes/atm/logo.svg.license new file mode 100644 index 000000000..8f84c8961 --- /dev/null +++ b/assets/themes/atm/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Michael Glanznig; Andy Allan +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/bag/logo.svg.license b/assets/themes/bag/logo.svg.license new file mode 100644 index 000000000..c644d685a --- /dev/null +++ b/assets/themes/bag/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Wouter van der Wal +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/benches/bench_poi.svg.license b/assets/themes/benches/bench_poi.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/themes/benches/bench_poi.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/benches/bench_public_transport.svg.license b/assets/themes/benches/bench_public_transport.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/themes/benches/bench_public_transport.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/bicycle_rental/logo.svg.license b/assets/themes/bicycle_rental/logo.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/bicycle_rental/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/bicycle_rental/rental.svg.license b/assets/themes/bicycle_rental/rental.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/bicycle_rental/rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/bicyclelib/logo.svg.license b/assets/themes/bicyclelib/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/bicyclelib/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/blind_osm/Blindicon.svg.license b/assets/themes/blind_osm/Blindicon.svg.license new file mode 100644 index 000000000..165a2acfd --- /dev/null +++ b/assets/themes/blind_osm/Blindicon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Abu badali; AIGA +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/bookcases/bookcase.svg.license b/assets/themes/bookcases/bookcase.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/themes/bookcases/bookcase.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/buurtnatuur/ANB.jpg.license b/assets/themes/buurtnatuur/ANB.jpg.license new file mode 100644 index 000000000..6d48803f7 --- /dev/null +++ b/assets/themes/buurtnatuur/ANB.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Agentschap Natuur en Bos +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/buurtnatuur/Natuurpunt.jpg.license b/assets/themes/buurtnatuur/Natuurpunt.jpg.license new file mode 100644 index 000000000..17b956445 --- /dev/null +++ b/assets/themes/buurtnatuur/Natuurpunt.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Natuurpunt +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/buurtnatuur/forest.svg.license b/assets/themes/buurtnatuur/forest.svg.license new file mode 100644 index 000000000..eac44623f --- /dev/null +++ b/assets/themes/buurtnatuur/forest.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @ Federico Sibella +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/buurtnatuur/groen_logo.svg.license b/assets/themes/buurtnatuur/groen_logo.svg.license new file mode 100644 index 000000000..1a7b157d0 --- /dev/null +++ b/assets/themes/buurtnatuur/groen_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Groen +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/buurtnatuur/logo.svg.license b/assets/themes/buurtnatuur/logo.svg.license new file mode 100644 index 000000000..1a7b157d0 --- /dev/null +++ b/assets/themes/buurtnatuur/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Groen +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/buurtnatuur/nature_reserve.svg.license b/assets/themes/buurtnatuur/nature_reserve.svg.license new file mode 100644 index 000000000..1ebbefa58 --- /dev/null +++ b/assets/themes/buurtnatuur/nature_reserve.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @ Эдуард Черных +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/buurtnatuur/park.svg.license b/assets/themes/buurtnatuur/park.svg.license new file mode 100644 index 000000000..fcc9542e3 --- /dev/null +++ b/assets/themes/buurtnatuur/park.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: @sterankofrank +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/buurtnatuur/social_image.jpg.license b/assets/themes/buurtnatuur/social_image.jpg.license new file mode 100644 index 000000000..537a9d776 --- /dev/null +++ b/assets/themes/buurtnatuur/social_image.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Groen +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/campersite/caravan.svg.license b/assets/themes/campersite/caravan.svg.license new file mode 100644 index 000000000..40713fd76 --- /dev/null +++ b/assets/themes/campersite/caravan.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OsmAnd +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/campersite/caravan_green.svg.license b/assets/themes/campersite/caravan_green.svg.license new file mode 100644 index 000000000..40713fd76 --- /dev/null +++ b/assets/themes/campersite/caravan_green.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OsmAnd +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/campersite/sanitary_dump_station.svg.license b/assets/themes/campersite/sanitary_dump_station.svg.license new file mode 100644 index 000000000..40713fd76 --- /dev/null +++ b/assets/themes/campersite/sanitary_dump_station.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OsmAnd +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/campersite/social_image.jpg.license b/assets/themes/campersite/social_image.jpg.license new file mode 100644 index 000000000..8bd94c66c --- /dev/null +++ b/assets/themes/campersite/social_image.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ES01 +SPDX-License-Identifier: CC-BY-SA-3.0 \ No newline at end of file diff --git a/assets/themes/charging_stations/bicycle.svg.license b/assets/themes/charging_stations/bicycle.svg.license new file mode 100644 index 000000000..681a0f5e3 --- /dev/null +++ b/assets/themes/charging_stations/bicycle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Stijn Wens +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/charging_stations/car.svg.license b/assets/themes/charging_stations/car.svg.license new file mode 100644 index 000000000..08d1901b5 --- /dev/null +++ b/assets/themes/charging_stations/car.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Simon Child; The Noun Project +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/charging_stations/logo.svg.license b/assets/themes/charging_stations/logo.svg.license new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/themes/charging_stations/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; 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 new file mode 100644 index 000000000..b580e3632 --- /dev/null +++ b/assets/themes/charging_stations/plug.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/assets/themes/climbing/carabiner.svg.license b/assets/themes/climbing/carabiner.svg.license new file mode 100644 index 000000000..68df0b689 --- /dev/null +++ b/assets/themes/climbing/carabiner.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthew Dera +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_gym.svg.license b/assets/themes/climbing/climbing_gym.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_gym.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_icon.svg.license b/assets/themes/climbing/climbing_icon.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_no_rope.svg.license b/assets/themes/climbing/climbing_no_rope.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_no_rope.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_rope.svg.license b/assets/themes/climbing/climbing_rope.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_rope.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_route.svg.license b/assets/themes/climbing/climbing_route.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_route.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/climbing_unknown.svg.license b/assets/themes/climbing/climbing_unknown.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/climbing_unknown.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/club.svg.license b/assets/themes/climbing/club.svg.license new file mode 100644 index 000000000..f604f9010 --- /dev/null +++ b/assets/themes/climbing/club.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Polarbear w; Christian Neumann +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/climbing/height.svg.license b/assets/themes/climbing/height.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/climbing/height.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ 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 new file mode 100644 index 000000000..491f19057 --- /dev/null +++ b/assets/themes/cycle_highways/fietssnelwegen-logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: De Vlaamse Provincies +SPDX-License-Identifier: LOGO-BY-THE-GOVERNMENT \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.svg.license b/assets/themes/cycle_infra/Cycle_barrier_double.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_length.png.license b/assets/themes/cycle_infra/Cycle_barrier_double_length.png.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double_length.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_length.svg.license b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double_length.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg.license b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double_overlap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_template.svg.license b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double_template.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double_width.svg.license b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_double_width.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_single.png.license b/assets/themes/cycle_infra/Cycle_barrier_single.png.license new file mode 100644 index 000000000..c12a59332 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_single.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Supaplex030 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_squeeze.png.license b/assets/themes/cycle_infra/Cycle_barrier_squeeze.png.license new file mode 100644 index 000000000..c12a59332 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_squeeze.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Supaplex030 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_triple.png.license b/assets/themes/cycle_infra/Cycle_barrier_triple.png.license new file mode 100644 index 000000000..c12a59332 --- /dev/null +++ b/assets/themes/cycle_infra/Cycle_barrier_triple.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Supaplex030 +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/bicycleway.svg.license b/assets/themes/cycle_infra/bicycleway.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/themes/cycle_infra/bicycleway.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/cycle-infra.svg.license b/assets/themes/cycle_infra/cycle-infra.svg.license new file mode 100644 index 000000000..a299f8818 --- /dev/null +++ b/assets/themes/cycle_infra/cycle-infra.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Dávid Gladiš; Hannah Declerck +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/cycle_infra/street.svg.license b/assets/themes/cycle_infra/street.svg.license new file mode 100644 index 000000000..7c8d2700e --- /dev/null +++ b/assets/themes/cycle_infra/street.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cyclenodes/license_info.json b/assets/themes/cyclenodes/license_info.json index 91390c118..469e824d7 100644 --- a/assets/themes/cyclenodes/license_info.json +++ b/assets/themes/cyclenodes/license_info.json @@ -1,7 +1,7 @@ [ { "path": "logo.svg", - "license": "GPL", + "license": "GPL-3.0-only", "authors": [ "sebkur" ], diff --git a/assets/themes/cyclenodes/logo.svg.license b/assets/themes/cyclenodes/logo.svg.license new file mode 100644 index 000000000..3176633b8 --- /dev/null +++ b/assets/themes/cyclenodes/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: sebkur +SPDX-License-Identifier: GPL-3.0-only \ No newline at end of file diff --git a/assets/themes/cyclestreets/F111.svg.license b/assets/themes/cyclestreets/F111.svg.license new file mode 100644 index 000000000..15eb59861 --- /dev/null +++ b/assets/themes/cyclestreets/F111.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The RedBurn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/F113.svg.license b/assets/themes/cyclestreets/F113.svg.license new file mode 100644 index 000000000..15eb59861 --- /dev/null +++ b/assets/themes/cyclestreets/F113.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The RedBurn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Finland_road_sign_E28.svg.license b/assets/themes/cyclestreets/Finland_road_sign_E28.svg.license new file mode 100644 index 000000000..f55974c59 --- /dev/null +++ b/assets/themes/cyclestreets/Finland_road_sign_E28.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Suomen tasavalta +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Finland_road_sign_E29.svg.license b/assets/themes/cyclestreets/Finland_road_sign_E29.svg.license new file mode 100644 index 000000000..f55974c59 --- /dev/null +++ b/assets/themes/cyclestreets/Finland_road_sign_E29.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Suomen tasavalta +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244.svg.license b/assets/themes/cyclestreets/Zeichen_244.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244_1020-30.svg.license b/assets/themes/cyclestreets/Zeichen_244_1020-30.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1020-30.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244_1022-12.svg.license b/assets/themes/cyclestreets/Zeichen_244_1022-12.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1022-12.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244_1024-10.svg.license b/assets/themes/cyclestreets/Zeichen_244_1024-10.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_1024-10.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg.license b/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/Zeichen_244a.svg.license b/assets/themes/cyclestreets/Zeichen_244a.svg.license new file mode 100644 index 000000000..183f599e6 --- /dev/null +++ b/assets/themes/cyclestreets/Zeichen_244a.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bundesministerium für Verkehr, Bau- und Wohnungswesen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cyclestreets/logo.svg.license b/assets/themes/cyclestreets/logo.svg.license new file mode 100644 index 000000000..15eb59861 --- /dev/null +++ b/assets/themes/cyclestreets/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The RedBurn +SPDX-License-Identifier: CC0-1.0 \ 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 new file mode 100644 index 000000000..b510fa42d --- /dev/null +++ b/assets/themes/cyclofix/fietsambassade_gent_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: De Fietsambassade +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ 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 new file mode 100644 index 000000000..b510fa42d --- /dev/null +++ b/assets/themes/cyclofix/fietsambassade_gent_logo_small.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: De Fietsambassade +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/cyclofix/key.svg.license b/assets/themes/cyclofix/key.svg.license new file mode 100644 index 000000000..9785dc0bb --- /dev/null +++ b/assets/themes/cyclofix/key.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Stijn Wens +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/cyclofix/logo.svg.license b/assets/themes/cyclofix/logo.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/themes/cyclofix/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/drinking_water/logo.svg.license b/assets/themes/drinking_water/logo.svg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/themes/drinking_water/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/elongated_coin/penny.svg.license b/assets/themes/elongated_coin/penny.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/themes/elongated_coin/penny.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/bloei.svg.license b/assets/themes/facadegardens/bloei.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/bloei.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/bodembedekker.svg.license b/assets/themes/facadegardens/bodembedekker.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/bodembedekker.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/eetbaar.svg.license b/assets/themes/facadegardens/eetbaar.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/eetbaar.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/gevelton.svg.license b/assets/themes/facadegardens/gevelton.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/gevelton.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/geveltuin.svg.license b/assets/themes/facadegardens/geveltuin.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/geveltuin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/halfzon.svg.license b/assets/themes/facadegardens/halfzon.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/halfzon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/klimplant.svg.license b/assets/themes/facadegardens/klimplant.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/klimplant.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/schaduw.svg.license b/assets/themes/facadegardens/schaduw.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/schaduw.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/struik.svg.license b/assets/themes/facadegardens/struik.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/struik.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/facadegardens/zon.svg.license b/assets/themes/facadegardens/zon.svg.license new file mode 100644 index 000000000..2c72064ca --- /dev/null +++ b/assets/themes/facadegardens/zon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Klimaan VZW +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/fritures/fries.svg.license b/assets/themes/fritures/fries.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/themes/fritures/fries.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/fritures/logo.svg.license b/assets/themes/fritures/logo.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/themes/fritures/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/fruit_trees/fruit_tree.svg.license b/assets/themes/fruit_trees/fruit_tree.svg.license new file mode 100644 index 000000000..78591d2d1 --- /dev/null +++ b/assets/themes/fruit_trees/fruit_tree.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The Noun Project +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/ghostbikes/logo.svg.license b/assets/themes/ghostbikes/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/ghostbikes/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/grb/housenumber_blank.svg.license b/assets/themes/grb/housenumber_blank.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/grb/housenumber_blank.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/grb/logo.svg.license b/assets/themes/grb/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/grb/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/grb/warning.svg.license b/assets/themes/grb/warning.svg.license new file mode 100644 index 000000000..91ad10d97 --- /dev/null +++ b/assets/themes/grb/warning.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: penubag +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/hackerspaces/glider.svg.license b/assets/themes/hackerspaces/glider.svg.license new file mode 100644 index 000000000..9a592b1fd --- /dev/null +++ b/assets/themes/hackerspaces/glider.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Bryan.burgers +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/hackerspaces/led.png.license b/assets/themes/hackerspaces/led.png.license new file mode 100644 index 000000000..526410b42 --- /dev/null +++ b/assets/themes/hackerspaces/led.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tommaso.sansone91 +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/Twemoji12_1f692.svg.license b/assets/themes/hailhydrant/Twemoji12_1f692.svg.license new file mode 100644 index 000000000..87b3cee91 --- /dev/null +++ b/assets/themes/hailhydrant/Twemoji12_1f692.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/Twemoji12_1f9ef.svg.license b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg.license new file mode 100644 index 000000000..87b3cee91 --- /dev/null +++ b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/Twemoji12_26d1.svg.license b/assets/themes/hailhydrant/Twemoji12_26d1.svg.license new file mode 100644 index 000000000..87b3cee91 --- /dev/null +++ b/assets/themes/hailhydrant/Twemoji12_26d1.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/Twemoji_1f691.svg.license b/assets/themes/hailhydrant/Twemoji_1f691.svg.license new file mode 100644 index 000000000..87b3cee91 --- /dev/null +++ b/assets/themes/hailhydrant/Twemoji_1f691.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Twemoji Project +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/hydrant.svg.license b/assets/themes/hailhydrant/hydrant.svg.license new file mode 100644 index 000000000..379a2b4ba --- /dev/null +++ b/assets/themes/hailhydrant/hydrant.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: GOwin +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/hydrant_pillar.svg.license b/assets/themes/hailhydrant/hydrant_pillar.svg.license new file mode 100644 index 000000000..0e2ea7dfa --- /dev/null +++ b/assets/themes/hailhydrant/hydrant_pillar.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: M!dgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/hydrant_underground.svg.license b/assets/themes/hailhydrant/hydrant_underground.svg.license new file mode 100644 index 000000000..0e2ea7dfa --- /dev/null +++ b/assets/themes/hailhydrant/hydrant_underground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: M!dgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/hydrant_unknown.svg.license b/assets/themes/hailhydrant/hydrant_unknown.svg.license new file mode 100644 index 000000000..0e2ea7dfa --- /dev/null +++ b/assets/themes/hailhydrant/hydrant_unknown.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: M!dgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json index 848611b3b..202a8e3a1 100644 --- a/assets/themes/hailhydrant/license_info.json +++ b/assets/themes/hailhydrant/license_info.json @@ -45,7 +45,7 @@ }, { "path": "hydrant.svg", - "license": "GPL", + "license": "GPL-2.0-or-later", "authors": [ "http://jaanos.deviantart.com/" ], diff --git a/assets/themes/hailhydrant/logo.svg.license b/assets/themes/hailhydrant/logo.svg.license new file mode 100644 index 000000000..3b33ed4fb --- /dev/null +++ b/assets/themes/hailhydrant/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Erwin Olario +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/maps/logo.svg.license b/assets/themes/maps/logo.svg.license new file mode 100644 index 000000000..6fd31e881 --- /dev/null +++ b/assets/themes/maps/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CC0 +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_10 mph.svg.license b/assets/themes/maxspeed/maxspeed_10 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_10 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_100 mph.svg.license b/assets/themes/maxspeed/maxspeed_100 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_100 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_110 mph.svg.license b/assets/themes/maxspeed/maxspeed_110 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_110 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_120 mph.svg.license b/assets/themes/maxspeed/maxspeed_120 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_120 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_130 mph.svg.license b/assets/themes/maxspeed/maxspeed_130 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_130 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_140 mph.svg.license b/assets/themes/maxspeed/maxspeed_140 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_140 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_20 mph.svg.license b/assets/themes/maxspeed/maxspeed_20 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_20 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_30 mph.svg.license b/assets/themes/maxspeed/maxspeed_30 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_30 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_40 mph.svg.license b/assets/themes/maxspeed/maxspeed_40 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_40 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_50 mph.svg.license b/assets/themes/maxspeed/maxspeed_50 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_50 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_60 mph.svg.license b/assets/themes/maxspeed/maxspeed_60 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_60 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_70 mph.svg.license b/assets/themes/maxspeed/maxspeed_70 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_70 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_80 mph.svg.license b/assets/themes/maxspeed/maxspeed_80 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_80 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_90 mph.svg.license b/assets/themes/maxspeed/maxspeed_90 mph.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_90 mph.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/maxspeed/maxspeed_logo.svg.license b/assets/themes/maxspeed/maxspeed_logo.svg.license new file mode 100644 index 000000000..992e37f9e --- /dev/null +++ b/assets/themes/maxspeed/maxspeed_logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: yopaseopor +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/nature/logo.svg.license b/assets/themes/nature/logo.svg.license new file mode 100644 index 000000000..c00773905 --- /dev/null +++ b/assets/themes/nature/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Font Awesome +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/notes/logo.svg.license b/assets/themes/notes/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/notes/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/onwheels/bicycle_pump.svg.license b/assets/themes/onwheels/bicycle_pump.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/bicycle_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/cafe.svg.license b/assets/themes/onwheels/cafe.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/cafe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/cone.svg.license b/assets/themes/onwheels/cone.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/cone.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/crest.svg.license b/assets/themes/onwheels/crest.svg.license new file mode 100644 index 000000000..7186216ab --- /dev/null +++ b/assets/themes/onwheels/crest.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Free Wheelies +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/onwheels/doctor.svg.license b/assets/themes/onwheels/doctor.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/doctor.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/elevator.svg.license b/assets/themes/onwheels/elevator.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/elevator.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/entrance.svg.license b/assets/themes/onwheels/entrance.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/entrance.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/government.svg.license b/assets/themes/onwheels/government.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/government.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/hospital.svg.license b/assets/themes/onwheels/hospital.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/hospital.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/hotel.svg.license b/assets/themes/onwheels/hotel.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/hotel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/parking.svg.license b/assets/themes/onwheels/parking.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/parking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/pharmacy.svg.license b/assets/themes/onwheels/pharmacy.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/pharmacy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/repair.svg.license b/assets/themes/onwheels/repair.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/repair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/restaurant.svg.license b/assets/themes/onwheels/restaurant.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/restaurant.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/shop.svg.license b/assets/themes/onwheels/shop.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/onwheels/toilet.svg.license b/assets/themes/onwheels/toilet.svg.license new file mode 100644 index 000000000..76cdf9a1a --- /dev/null +++ b/assets/themes/onwheels/toilet.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: CT Steward +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/openwindpowermap/logo.svg.license b/assets/themes/openwindpowermap/logo.svg.license new file mode 100644 index 000000000..9e50dbb72 --- /dev/null +++ b/assets/themes/openwindpowermap/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Iconathon +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/openwindpowermap/wind_turbine.svg.license b/assets/themes/openwindpowermap/wind_turbine.svg.license new file mode 100644 index 000000000..9e50dbb72 --- /dev/null +++ b/assets/themes/openwindpowermap/wind_turbine.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Iconathon +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/osm_community_index/license_info.json b/assets/themes/osm_community_index/license_info.json index d0c1f83df..b73e21ee0 100644 --- a/assets/themes/osm_community_index/license_info.json +++ b/assets/themes/osm_community_index/license_info.json @@ -1,7 +1,7 @@ [ { "path": "osm.svg", - "license": "ISC-LICENSE", + "license": "ISC", "authors": [ "osmlab" ], diff --git a/assets/themes/osm_community_index/osm.svg.license b/assets/themes/osm_community_index/osm.svg.license new file mode 100644 index 000000000..11884bd00 --- /dev/null +++ b/assets/themes/osm_community_index/osm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: osmlab +SPDX-License-Identifier: ISC \ No newline at end of file diff --git a/assets/themes/parkings/parkings.svg.license b/assets/themes/parkings/parkings.svg.license new file mode 100644 index 000000000..d26b56c68 --- /dev/null +++ b/assets/themes/parkings/parkings.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Freepik +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/pets/dog-food.svg.license b/assets/themes/pets/dog-food.svg.license new file mode 100644 index 000000000..ceb7153fa --- /dev/null +++ b/assets/themes/pets/dog-food.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Public Domain Symbols; Jean Victor Balin ; Niels Elgaard Larsen +SPDX-License-Identifier: PD \ No newline at end of file diff --git a/assets/themes/pets/dogshop.svg.license b/assets/themes/pets/dogshop.svg.license new file mode 100644 index 000000000..1ba744f72 --- /dev/null +++ b/assets/themes/pets/dogshop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Public Domain Symbols; Niels Elgaard Larsen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/pets/petshop.svg.license b/assets/themes/pets/petshop.svg.license new file mode 100644 index 000000000..cbb319dbf --- /dev/null +++ b/assets/themes/pets/petshop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Niels Elgaard Larsen; Public Domain Symbols +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/playgrounds/playground.svg.license b/assets/themes/playgrounds/playground.svg.license new file mode 100644 index 000000000..24a643b39 --- /dev/null +++ b/assets/themes/playgrounds/playground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Scott de Jonge +SPDX-License-Identifier: CC-BY-3.0 \ No newline at end of file diff --git a/assets/themes/postal_codes/townhall.svg.license b/assets/themes/postal_codes/townhall.svg.license new file mode 100644 index 000000000..d0c4f96ba --- /dev/null +++ b/assets/themes/postal_codes/townhall.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Nebulon42 +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/rainbow_crossings/crossing.svg.license b/assets/themes/rainbow_crossings/crossing.svg.license new file mode 100644 index 000000000..1dc9051c6 --- /dev/null +++ b/assets/themes/rainbow_crossings/crossing.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: bxl-forever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/rainbow_crossings/logo.svg.license b/assets/themes/rainbow_crossings/logo.svg.license new file mode 100644 index 000000000..1dc9051c6 --- /dev/null +++ b/assets/themes/rainbow_crossings/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: bxl-forever +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/shops/shop.svg.license b/assets/themes/shops/shop.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/themes/shops/shop.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license new file mode 100644 index 000000000..c3bbb0cb1 --- /dev/null +++ b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Departement Omgeving, Vlaamse Overheid +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/speelplekken/logo.svg.license b/assets/themes/speelplekken/logo.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/themes/speelplekken/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/speelplekken/provincie_antwerpen.jpg.license b/assets/themes/speelplekken/provincie_antwerpen.jpg.license new file mode 100644 index 000000000..933d61ac8 --- /dev/null +++ b/assets/themes/speelplekken/provincie_antwerpen.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Provincie Antwerpen +SPDX-License-Identifier: LOGO; ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/speelplekken/social_image.jpg.license b/assets/themes/speelplekken/social_image.jpg.license new file mode 100644 index 000000000..61a994887 --- /dev/null +++ b/assets/themes/speelplekken/social_image.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Createlli +SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file diff --git a/assets/themes/speelplekken/speelbos.svg.license b/assets/themes/speelplekken/speelbos.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/themes/speelplekken/speelbos.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/speelplekken/speeltuin.svg.license b/assets/themes/speelplekken/speeltuin.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/themes/speelplekken/speeltuin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/speelplekken/speelweide.svg.license b/assets/themes/speelplekken/speelweide.svg.license new file mode 100644 index 000000000..0ab16b3a1 --- /dev/null +++ b/assets/themes/speelplekken/speelweide.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Gitte Loos (Createlli) in opdracht van Provincie Antwerpen +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/speelplekken/youtube.svg.license b/assets/themes/speelplekken/youtube.svg.license new file mode 100644 index 000000000..1d2dc630c --- /dev/null +++ b/assets/themes/speelplekken/youtube.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Youtube +SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file diff --git a/assets/themes/sports/sport.svg.license b/assets/themes/sports/sport.svg.license new file mode 100644 index 000000000..b6371215e --- /dev/null +++ b/assets/themes/sports/sport.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick; modified from EmojiOne 2: U+26BD +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/themes/stations/bench.svg.license b/assets/themes/stations/bench.svg.license new file mode 100644 index 000000000..3fc84fc55 --- /dev/null +++ b/assets/themes/stations/bench.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthijs Melissen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/bicycle_parking.svg.license b/assets/themes/stations/bicycle_parking.svg.license new file mode 100644 index 000000000..3fc84fc55 --- /dev/null +++ b/assets/themes/stations/bicycle_parking.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthijs Melissen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/departures_board.svg.license b/assets/themes/stations/departures_board.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/themes/stations/departures_board.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/drinking_water.svg.license b/assets/themes/stations/drinking_water.svg.license new file mode 100644 index 000000000..e83d762ca --- /dev/null +++ b/assets/themes/stations/drinking_water.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andy Allan; Michael Glanznig +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/public_transport_tickets.svg.license b/assets/themes/stations/public_transport_tickets.svg.license new file mode 100644 index 000000000..a342db9b9 --- /dev/null +++ b/assets/themes/stations/public_transport_tickets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jérémy Ragusa +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/rail-light.svg.license b/assets/themes/stations/rail-light.svg.license new file mode 100644 index 000000000..0cf6926f1 --- /dev/null +++ b/assets/themes/stations/rail-light.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Maki +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/stations/rental_bicycle.svg.license b/assets/themes/stations/rental_bicycle.svg.license new file mode 100644 index 000000000..8f84c8961 --- /dev/null +++ b/assets/themes/stations/rental_bicycle.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Michael Glanznig; Andy Allan +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/surveillance/cam_left.svg.license b/assets/themes/surveillance/cam_left.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/surveillance/cam_left.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/surveillance/cam_right.svg.license b/assets/themes/surveillance/cam_right.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/surveillance/cam_right.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/surveillance/dome.svg.license b/assets/themes/surveillance/dome.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/surveillance/dome.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/surveillance/logo.svg.license b/assets/themes/surveillance/logo.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/surveillance/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license new file mode 100644 index 000000000..6348ee577 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jo De Baerdemaeker +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license new file mode 100644 index 000000000..6348ee577 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jo De Baerdemaeker +SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/bench.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/bicycle_rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/charging_station_ebike.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair_and_pump.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair_and_pump.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/cycle_repair_and_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_platform.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/observation_tower.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/picnic_table.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/playground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg.license b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/toilets_wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/avatar.png.license b/assets/themes/toerisme_vlaanderen/avatar.png.license new file mode 100644 index 000000000..123463272 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/avatar.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/bench.svg.license b/assets/themes/toerisme_vlaanderen/bench.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/bench.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/bicycle_rental.svg.license b/assets/themes/toerisme_vlaanderen/bicycle_rental.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/bicycle_rental.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg.license b/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/charging_station_ebike.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/cycle_pump.svg.license b/assets/themes/toerisme_vlaanderen/cycle_pump.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/cycle_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/cycle_repair.svg.license b/assets/themes/toerisme_vlaanderen/cycle_repair.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/cycle_repair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/cycle_repair_and_pump.svg.license b/assets/themes/toerisme_vlaanderen/cycle_repair_and_pump.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/cycle_repair_and_pump.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ 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 5e4bd3e90..5bb89aa0d 100644 --- a/assets/themes/toerisme_vlaanderen/license_info.json +++ b/assets/themes/toerisme_vlaanderen/license_info.json @@ -107,7 +107,7 @@ }, { "path": "logo.svg", - "license": "CREATIVE-COMMONS-4.0-BY-NC", + "license": "CC-BY-NC-4.0", "authors": [], "sources": [ "https://pngimg.com/image/46283" diff --git a/assets/themes/toerisme_vlaanderen/logo.png.license b/assets/themes/toerisme_vlaanderen/logo.png.license new file mode 100644 index 000000000..e75e5dc25 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/logo.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: LOGO-(ALL-RIGHTS-RESERVED) \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/logo.svg.license b/assets/themes/toerisme_vlaanderen/logo.svg.license new file mode 100644 index 000000000..0c124e452 --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC-BY-NC-4.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/observation_platform.svg.license b/assets/themes/toerisme_vlaanderen/observation_platform.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/observation_platform.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/observation_tower.svg.license b/assets/themes/toerisme_vlaanderen/observation_tower.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/observation_tower.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/picnic_table.svg.license b/assets/themes/toerisme_vlaanderen/picnic_table.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/picnic_table.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt1.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt1.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt1.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt2.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt2.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt2.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt3.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt3.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt3.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt4.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt4.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt4.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt5.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt5.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt5.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/pin je punt6.jpg.license b/assets/themes/toerisme_vlaanderen/pin je punt6.jpg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/pin je punt6.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/playground.svg.license b/assets/themes/toerisme_vlaanderen/playground.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/playground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/toilets.svg.license b/assets/themes/toerisme_vlaanderen/toilets.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/toilets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg.license b/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg.license new file mode 100644 index 000000000..34151550d --- /dev/null +++ b/assets/themes/toerisme_vlaanderen/toilets_wheelchair.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Toerisme Vlaanderen +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/toilets/toilets.svg.license b/assets/themes/toilets/toilets.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/themes/toilets/toilets.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/trees/logo.svg.license b/assets/themes/trees/logo.svg.license new file mode 100644 index 000000000..e288ab760 --- /dev/null +++ b/assets/themes/trees/logo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Midgard +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/housenumber_add.svg.license b/assets/themes/uk_addresses/housenumber_add.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/uk_addresses/housenumber_add.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/housenumber_ok.svg.license b/assets/themes/uk_addresses/housenumber_ok.svg.license new file mode 100644 index 000000000..3d842a49c --- /dev/null +++ b/assets/themes/uk_addresses/housenumber_ok.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick (westnordost) +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/housenumber_text.svg.license b/assets/themes/uk_addresses/housenumber_text.svg.license new file mode 100644 index 000000000..3d842a49c --- /dev/null +++ b/assets/themes/uk_addresses/housenumber_text.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick (westnordost) +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/housenumber_unknown.svg.license b/assets/themes/uk_addresses/housenumber_unknown.svg.license new file mode 100644 index 000000000..3d842a49c --- /dev/null +++ b/assets/themes/uk_addresses/housenumber_unknown.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Tobias Zwick (westnordost) +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/housenumber_unknown_small.svg.license b/assets/themes/uk_addresses/housenumber_unknown_small.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/themes/uk_addresses/housenumber_unknown_small.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/uk_addresses/stamp-outline.png.license b/assets/themes/uk_addresses/stamp-outline.png.license new file mode 100644 index 000000000..95be7235c --- /dev/null +++ b/assets/themes/uk_addresses/stamp-outline.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Rob Nickerson +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/waste_basket/waste_basket.svg.license b/assets/themes/waste_basket/waste_basket.svg.license new file mode 100644 index 000000000..f1526f24e --- /dev/null +++ b/assets/themes/waste_basket/waste_basket.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/width/icon.svg.license b/assets/themes/width/icon.svg.license new file mode 100644 index 000000000..bc8dad3c0 --- /dev/null +++ b/assets/themes/width/icon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0; TRIVIAL \ No newline at end of file diff --git a/generated.license_info.json b/generated.license_info.json deleted file mode 100644 index 83e959fa1..000000000 --- a/generated.license_info.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "path": "hydrant_pillar.svg", - "license": "", - "authors": [], - "sources": [ - "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_pillar.svg" - ] - }, - { - "path": "hydrant_unknown.svg", - "license": "", - "authors": [], - "sources": [ - "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_unknown.svg" - ] - }, - { - "path": "hydrant_underground.svg", - "license": "", - "authors": [], - "sources": [ - "https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg" - ] - }, - { - "path": "Hydrant_02.svg", - "license": "", - "authors": [], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/6/66/Hydrant_02.svg" - ] - }, - { - "path": "MUTCD_RS-090.svg", - "license": "", - "authors": [], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/e/e8/MUTCD_RS-090.svg" - ] - }, - { - "path": "British_Columbia_W-318-L.svg", - "license": "", - "authors": [], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/8/84/British_Columbia_W-318-L.svg" - ] - }, - { - "path": "Emojione_1F6A8.svg", - "license": "", - "authors": [], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/1/1e/Emojione_1F6A8.svg" - ] - } -] \ No newline at end of file diff --git a/package.json b/package.json index c083a1aff..4c3acf4fc 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "weblate-add-upstream": "git remote add weblate-github git@github.com:weblate/MapComplete.git && git remote add weblate-hosted-core https://hosted.weblate.org/git/mapcomplete/core/ && git remote add weblate-hosted-layers https://hosted.weblate.org/git/mapcomplete/layers/", "weblate-merge": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations", "weblate-fix-heavy": "git fetch weblate-hosted-layers; git fetch weblate-hosted-core; git merge weblate-hosted-layers/master weblate-hosted-core/master ", - "housekeeping": "git pull && npx update-browserslist-db@latest && npm run weblate-fix-heavy && npm run generate && npm run generate:docs && npm run generate:contributor-list && vite-node scripts/fetchLanguages.ts && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'chore: automated housekeeping...'" + "housekeeping": "git pull && npx update-browserslist-db@latest && npm run weblate-fix-heavy && npm run generate && npm run generate:docs && npm run generate:contributor-list && vite-node scripts/fetchLanguages.ts && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'chore: automated housekeeping...'", "reuse-compliance": "reuse lint" }, "keywords": [ diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index d45a8ad99..bdd976341 100644 --- a/scripts/generateLicenseInfo.ts +++ b/scripts/generateLicenseInfo.ts @@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from " import SmallLicense from "../src/Models/smallLicense" import ScriptUtils from "./ScriptUtils" import Script from "./Script" +import { Utils } from "../src/Utils" const prompt = require("prompt-sync")() @@ -185,6 +186,41 @@ export class GenerateLicenseInfo extends Script { writeFileSync(path + ".license_info.json", JSON.stringify(li, null, " ")) } + /** + * Rewrites a license into a SPDX-valid-ID. + * Might involve some guesswork (e.g. 'CC-BY-SA' --> 'CC-BY-SA 4.0" + * @param licenseId + */ + toSPDXCompliantLicense(licenseId: string): string { + licenseId = licenseId.trim().replaceAll(" ", "-") + if (!(licenseId.endsWith("-only") || licenseId.endsWith("-or-later"))) { + licenseId = licenseId.toUpperCase() + } + // https://spdx.org/licenses/ + const mappings: Record = { + "CC-0": "CC0-1.0", + CC0: "CC0-1.0", + "CC-BY-4.0-INTERNATIONAL": "CC-BY-4.0", + "CC-4.0": "CC-BY-4.0", + "CC-BY": "CC-BY-4.0", + "CC-BY-SA-4.0-INTERNATIONAL": "CC-BY-SA-4.0", + "CC-BY-SA": "CC-BY-SA-4.0", + "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", + /* 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 @@ -208,6 +244,11 @@ export class GenerateLicenseInfo extends Script { authors: license.authors, sources: license.sources, } + + cloned.license = Utils.Dedup( + cloned.license.split(";").map((l) => this.toSPDXCompliantLicense(l)) + ).join("; ") + perDirectory.get(dir).push(cloned) } @@ -339,6 +380,14 @@ export class GenerateLicenseInfo extends Script { invalidLicenses.push("Not a valid URL: " + source) } } + + const spdxPath = licenseInfo.path + ".license" + + const spdxContent = [ + "SPDX-FileCopyrightText: " + licenseInfo.authors.join("; "), + "SPDX-License-Identifier: " + licenseInfo.license, + ] + writeFileSync(spdxPath, spdxContent.join("\n")) } if (missingLicenses.length > 0 || invalidLicenses.length) { From 257e6dd2b5343782ac9b68153f564b76b972aa02 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 13:04:27 +0200 Subject: [PATCH 025/134] Docs: more work on the licenses --- LICENSES/LOGO.txt | 1 + assets/layers/food/license_info.json | 2 +- assets/layers/veterinary/license_info.json | 2 +- assets/themes/cycle_highways/license_info.json | 2 +- assets/themes/pets/license_info.json | 2 +- scripts/generateLicenseInfo.ts | 16 +++++++++------- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/LICENSES/LOGO.txt b/LICENSES/LOGO.txt index cb76b7364..52adb9474 100644 --- a/LICENSES/LOGO.txt +++ b/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. diff --git a/assets/layers/food/license_info.json b/assets/layers/food/license_info.json index 8006dbff6..aae3af1da 100644 --- a/assets/layers/food/license_info.json +++ b/assets/layers/food/license_info.json @@ -1,7 +1,7 @@ [ { "path": "Vegetarian-mark.svg", - "license": "PD", + "license": "PUBLIC-DOMAIN", "authors": [ "European Vegetarian Union" ], diff --git a/assets/layers/veterinary/license_info.json b/assets/layers/veterinary/license_info.json index 0b9a7474d..9fa958690 100644 --- a/assets/layers/veterinary/license_info.json +++ b/assets/layers/veterinary/license_info.json @@ -1,7 +1,7 @@ [ { "path": "vet.svg", - "license": "PD", + "license": "PUBLIC-DOMAIN", "authors": [ "Niels Elgaard Larsen", "Tim Hitchins" diff --git a/assets/themes/cycle_highways/license_info.json b/assets/themes/cycle_highways/license_info.json index d34b04f2c..ef2a5e147 100644 --- a/assets/themes/cycle_highways/license_info.json +++ b/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" ], diff --git a/assets/themes/pets/license_info.json b/assets/themes/pets/license_info.json index be5931c92..7bfabe9b0 100644 --- a/assets/themes/pets/license_info.json +++ b/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 ", diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index bdd976341..96c106b2c 100644 --- a/scripts/generateLicenseInfo.ts +++ b/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) } From c7d4007f93543e9df7ed411c93979d2b4c218b6e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:10:08 +0200 Subject: [PATCH 026/134] 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) { From de4ad490a4dc6e62bade743895ff97e663b32f32 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:10:15 +0200 Subject: [PATCH 027/134] Add licenses on the last files --- LICENSES/AGPL-3.0-or-later.txt | 235 ++++++++++++++++++ LICENSES/BSD-3-Clause.txt | 11 + .../themes/cyclofix/SocialImage.jpeg.license | 2 + ...tion of Education (ISCED) 2011.pdf.license | 2 + .../speelplekken/shadow.geojson.license | 2 + 5 files changed, 252 insertions(+) create mode 100644 LICENSES/AGPL-3.0-or-later.txt create mode 100644 LICENSES/BSD-3-Clause.txt create mode 100644 assets/themes/cyclofix/SocialImage.jpeg.license create mode 100644 assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license create mode 100644 assets/themes/speelplekken/shadow.geojson.license diff --git a/LICENSES/AGPL-3.0-or-later.txt b/LICENSES/AGPL-3.0-or-later.txt new file mode 100644 index 000000000..0c97efd25 --- /dev/null +++ b/LICENSES/AGPL-3.0-or-later.txt @@ -0,0 +1,235 @@ +GNU AFFERO GENERAL PUBLIC LICENSE +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. + +A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. + +The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. + +An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. + +The precise terms and conditions for copying, distribution and modification follow. + + TERMS AND CONDITIONS + +0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the Program. + +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), making available to the public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. + +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. + +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 000000000..ea890afbc --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,11 @@ +Copyright (c) . + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/assets/themes/cyclofix/SocialImage.jpeg.license b/assets/themes/cyclofix/SocialImage.jpeg.license new file mode 100644 index 000000000..328c3138d --- /dev/null +++ b/assets/themes/cyclofix/SocialImage.jpeg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Fiers; Thibault Declercq; Pierre Barban; Joost Schouppe; Pieter Vander Vennet +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license new file mode 100644 index 000000000..4ef5a8606 --- /dev/null +++ b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ©UNESCO-UIS 2012 http://www.uis.unesco.org +SPDX-License-Identifier: ALL-RIGHTS-RESERVED diff --git a/assets/themes/speelplekken/shadow.geojson.license b/assets/themes/speelplekken/shadow.geojson.license new file mode 100644 index 000000000..024e83464 --- /dev/null +++ b/assets/themes/speelplekken/shadow.geojson.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Vlaamse Overheid +SPDX-License-Identifier: ALL-RIGHTS-RESERVED From 0d705b97277a7c6cba5a57d071aeaace1a24fc5a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:15:30 +0200 Subject: [PATCH 028/134] Fix: fix build --- scripts/generateIncludedImages.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/generateIncludedImages.ts b/scripts/generateIncludedImages.ts index d54d60c11..5d5295b0a 100644 --- a/scripts/generateIncludedImages.ts +++ b/scripts/generateIncludedImages.ts @@ -11,6 +11,9 @@ function genImages(dryrun = false) { if (path.endsWith("license_info.json")) { continue } + if (path.endsWith(".license")) { + continue + } if (!path.endsWith(".svg")) { throw "Non-svg file detected in the svg files: " + path From 4245c16d41435791fdf37929c9e7a9b9bf122f27 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 27 Jul 2023 14:33:28 +0200 Subject: [PATCH 029/134] Change zoom values, add survey question --- assets/layers/questions/questions.json | 21 +++++++++++++++++++++ assets/layers/recycling/recycling.json | 7 ++++--- assets/themes/waste/waste.json | 4 ++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 58e8131c0..1f5672680 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -2150,6 +2150,27 @@ } } ] + }, + { + "id": "survey_date", + "question": { + "en": "When was this object last surveyed?" + }, + "freeform": { + "key": "survey:date", + "type": "date" + }, + "render": { + "en": "This object was last surveyed on {survey:date}" + }, + "mappings": [ + { + "if": "survey:date:={_now:date}", + "then": { + "en": "This object was last surveyed today" + } + } + ] } ] } \ No newline at end of file diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 51fcececd..297f26d88 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -25,7 +25,7 @@ "calculatedTags": [ "_waste_amount=Object.values(Object.keys(feat.properties).filter((key) => key.startsWith('recycling:')).reduce((cur, key) => { return Object.assign(cur, { [key]: feat.properties[key] })}, {})).reduce((n, x) => n + (x == \"yes\"), 0);" ], - "minzoom": 11, + "minzoom": 10, "title": { "render": { "en": "Recycling facility", @@ -1262,7 +1262,8 @@ "ca": "Aquesta instal·lació de reciclatge la pot utilitzar {access}", "fr": "Ce point de recyclage peut être utilisé par {access}" } - } + }, + "survey_date" ], "filter": [ "open_now", @@ -1566,4 +1567,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} +} \ No newline at end of file diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json index ca29f00e9..90c992cf6 100644 --- a/assets/themes/waste/waste.json +++ b/assets/themes/waste/waste.json @@ -34,8 +34,8 @@ { "builtin": "waste_basket", "override": { - "minzoom": 18, - "minzoomVisible": 18 + "minzoom": 16, + "minzoomVisible": 16 } }, "recycling", From 840679961ffbb27c4748cc91366088e5414a5f41 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 27 Jul 2023 14:33:34 +0200 Subject: [PATCH 030/134] Allow adding crossing in kerbs and crossings theme --- .../kerbs_and_crossings.json | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json index c44fa1d11..a42d540c0 100644 --- a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json +++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json @@ -28,10 +28,45 @@ "startLat": 53.23776, "startLon": 6.53812, "layers": [ + { + "builtin": "cycleways_and_roads", + "override": { + "title": null, + "forceLoad": true, + "minzoom": 18, + "passAllFeatures": true, + "shownByDefault": false + } + }, { "builtin": "crossings", "override": { - "=presets": [], + "=presets": [ + { + "title": { + "en": "a crossing", + "nl": "een oversteekplaats", + "de": "eine Kreuzung", + "fr": "une traversée", + "ca": "un pas de vianants", + "da": "en overgang", + "es": "un cruce" + }, + "tags": [ + "highway=crossing" + ], + "description": { + "en": "Crossing for pedestrians and/or cyclists", + "nl": "Oversteekplaats voor voetgangers en/of fietsers", + "de": "Kreuzung für Fußgänger und/oder Radfahrer", + "fr": "Traversée pour piétons et/ou cyclistes", + "da": "Overgang for fodgængere og/eller cyklister", + "es": "Cruce para peatones y/o ciclistas" + }, + "snapToLayer": "cycleways_and_roads", + "maxSnapDistance": 25 + } + ], "source": { "osmTags": "highway=crossing" } From 6c4b464f14ed2851980da34e12df355cb8137ba7 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 27 Jul 2023 14:34:05 +0200 Subject: [PATCH 031/134] Fix: SPDX-compliance --- .reuse/dep5 | 2 +- ...txt => LicenseRef-ALL-RIGHTS-RESERVED.txt} | 0 LICENSES/{LOGO.txt => LicenseRef-LOGO.txt} | 0 .../{TRIVIAL.txt => LicenseRef-TRIVIAL.txt} | 0 ...txt => LicenseRef-UBUNTU-FONT-LICENSE.txt} | 0 .../pump_example.png.license | 2 +- .../pump_example_round.jpg.license | 2 +- .../layers/food/Vegetarian-mark.svg.license | 2 +- assets/layers/nature_reserve/ANB.jpg.license | 2 +- .../nature_reserve/Natuurpunt.jpg.license | 2 +- .../nature_reserve/groen_logo.svg.license | 2 +- assets/layers/play_forest/icon.svg.license | 2 +- .../layers/questions/send_email.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/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/none.svg.license | 2 +- assets/svg/osm-logo-us.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/buurtnatuur/ANB.jpg.license | 2 +- .../themes/buurtnatuur/Natuurpunt.jpg.license | 2 +- .../themes/buurtnatuur/groen_logo.svg.license | 2 +- assets/themes/buurtnatuur/logo.svg.license | 2 +- .../buurtnatuur/social_image.jpg.license | 2 +- .../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 +- ...tion of Education (ISCED) 2011.pdf.license | 2 +- ...epartement_Omgeving_Vlaanderen.png.license | 2 +- .../provincie_antwerpen.jpg.license | 2 +- .../speelplekken/shadow.geojson.license | 2 +- .../speelplekken/social_image.jpg.license | 2 +- .../themes/speelplekken/youtube.svg.license | 2 +- .../FlandersArtSans-Light.woff.license | 2 +- .../FlandersArtSerif-Medium.woff.license | 2 +- .../toerisme_vlaanderen/avatar.png.license | 2 +- .../toerisme_vlaanderen/logo.png.license | 2 +- assets/themes/width/icon.svg.license | 2 +- scripts/generateLicenseInfo.ts | 43 +++++++++++++------ 73 files changed, 98 insertions(+), 81 deletions(-) rename LICENSES/{ALL-RIGHTS-RESERVED.txt => LicenseRef-ALL-RIGHTS-RESERVED.txt} (100%) rename LICENSES/{LOGO.txt => LicenseRef-LOGO.txt} (100%) rename LICENSES/{TRIVIAL.txt => LicenseRef-TRIVIAL.txt} (100%) rename LICENSES/{UBUNTU-FONT-LICENSE.txt => LicenseRef-UBUNTU-FONT-LICENSE.txt} (100%) diff --git a/.reuse/dep5 b/.reuse/dep5 index 77c517fd6..7917d2bbf 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -30,7 +30,7 @@ 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 +License: LicenseRef-UBUNTU-FONT-LICENSE Files: public/assets/*.svg public/assets/*.png public/apple_touch_icon.png diff --git a/LICENSES/ALL-RIGHTS-RESERVED.txt b/LICENSES/LicenseRef-ALL-RIGHTS-RESERVED.txt similarity index 100% rename from LICENSES/ALL-RIGHTS-RESERVED.txt rename to LICENSES/LicenseRef-ALL-RIGHTS-RESERVED.txt diff --git a/LICENSES/LOGO.txt b/LICENSES/LicenseRef-LOGO.txt similarity index 100% rename from LICENSES/LOGO.txt rename to LICENSES/LicenseRef-LOGO.txt diff --git a/LICENSES/TRIVIAL.txt b/LICENSES/LicenseRef-TRIVIAL.txt similarity index 100% rename from LICENSES/TRIVIAL.txt rename to LICENSES/LicenseRef-TRIVIAL.txt diff --git a/LICENSES/UBUNTU-FONT-LICENSE.txt b/LICENSES/LicenseRef-UBUNTU-FONT-LICENSE.txt similarity index 100% rename from LICENSES/UBUNTU-FONT-LICENSE.txt rename to LICENSES/LicenseRef-UBUNTU-FONT-LICENSE.txt diff --git a/assets/layers/bike_repair_station/pump_example.png.license b/assets/layers/bike_repair_station/pump_example.png.license index 2f29b4e67..8253fd083 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: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 696296a94..e9ffc3b41 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: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ 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 55f9e8ef7..fd14a6beb 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: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/nature_reserve/ANB.jpg.license b/assets/layers/nature_reserve/ANB.jpg.license index 919f752bb..103696d37 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 e429d2683..908dc4041 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 81a8cecc7..047a125bb 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: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/play_forest/icon.svg.license b/assets/layers/play_forest/icon.svg.license index 919f752bb..103696d37 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: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/layers/questions/send_email.svg.license b/assets/layers/questions/send_email.svg.license index 0dedec0e0..22b8ca7a5 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/close.svg.license b/assets/svg/close.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/close.svg.license +++ b/assets/svg/close.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/compass.svg.license b/assets/svg/compass.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/compass.svg.license +++ b/assets/svg/compass.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 0dedec0e0..22b8ca7a5 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair-locked.svg.license b/assets/svg/crosshair-locked.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/crosshair-locked.svg.license +++ b/assets/svg/crosshair-locked.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/crosshair.svg.license b/assets/svg/crosshair.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/crosshair.svg.license +++ b/assets/svg/crosshair.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/direction_gradient.svg.license b/assets/svg/direction_gradient.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/direction_gradient.svg.license +++ b/assets/svg/direction_gradient.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/envelope.svg.license b/assets/svg/envelope.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/envelope.svg.license +++ b/assets/svg/envelope.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/gear.svg.license b/assets/svg/gear.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/gear.svg.license +++ b/assets/svg/gear.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/help.svg.license b/assets/svg/help.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/help.svg.license +++ b/assets/svg/help.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/layers.svg.license b/assets/svg/layers.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/layers.svg.license +++ b/assets/svg/layers.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/liberapay.svg.license b/assets/svg/liberapay.svg.license index 9a56f9841..9432bc4c7 100644 --- a/assets/svg/liberapay.svg.license +++ b/assets/svg/liberapay.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: LiberaPay -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/loading.svg.license b/assets/svg/loading.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/loading.svg.license +++ b/assets/svg/loading.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/logo.svg.license b/assets/svg/logo.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/logo.svg.license +++ b/assets/svg/logo.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/logout.svg.license b/assets/svg/logout.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/logout.svg.license +++ b/assets/svg/logout.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/mapcomplete_logo.svg.license b/assets/svg/mapcomplete_logo.svg.license index 27072db67..12c9d0f66 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 AND CC-BY-SA-4.0 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 c0b41f41c..1f3f507b4 100644 --- a/assets/svg/mapillary.svg.license +++ b/assets/svg/mapillary.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mapillary -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/mapillary_black.svg.license b/assets/svg/mapillary_black.svg.license index c0b41f41c..1f3f507b4 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/mastodon.svg.license b/assets/svg/mastodon.svg.license index 734852b4d..8bb252597 100644 --- a/assets/svg/mastodon.svg.license +++ b/assets/svg/mastodon.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mastodon -SPDX-License-Identifier: LOGO AND AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/min.svg.license +++ b/assets/svg/min.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/no_checkmark.svg.license b/assets/svg/no_checkmark.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/no_checkmark.svg.license +++ b/assets/svg/no_checkmark.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/none.svg.license b/assets/svg/none.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/none.svg.license +++ b/assets/svg/none.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/osm-logo-us.svg.license b/assets/svg/osm-logo-us.svg.license index 0b7a3e969..10ae3e2e4 100644 --- a/assets/svg/osm-logo-us.svg.license +++ b/assets/svg/osm-logo-us.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: OpenStreetMap U.S. Chapter -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/osm-logo.svg.license b/assets/svg/osm-logo.svg.license index a8026aac0..ed63c50d5 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/pin.svg.license b/assets/svg/pin.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/pin.svg.license +++ b/assets/svg/pin.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/plantnet_logo.svg.license b/assets/svg/plantnet_logo.svg.license index 0c21c18ac..e173bf288 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/plus.svg.license b/assets/svg/plus.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/plus.svg.license +++ b/assets/svg/plus.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/reload.svg.license b/assets/svg/reload.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/reload.svg.license +++ b/assets/svg/reload.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/ring.svg.license b/assets/svg/ring.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/ring.svg.license +++ b/assets/svg/ring.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/share.svg.license b/assets/svg/share.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/share.svg.license +++ b/assets/svg/share.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/square.svg.license b/assets/svg/square.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/square.svg.license +++ b/assets/svg/square.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star.svg.license b/assets/svg/star.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star.svg.license +++ b/assets/svg/star.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_half.svg.license b/assets/svg/star_half.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star_half.svg.license +++ b/assets/svg/star_half.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/star_outline.svg.license b/assets/svg/star_outline.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/star_outline.svg.license +++ b/assets/svg/star_outline.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 0dedec0e0..22b8ca7a5 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/up.svg.license b/assets/svg/up.svg.license index 0dedec0e0..22b8ca7a5 100644 --- a/assets/svg/up.svg.license +++ b/assets/svg/up.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: -SPDX-License-Identifier: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/assets/svg/wikidata.svg.license b/assets/svg/wikidata.svg.license index 5435f678e..48866d730 100644 --- a/assets/svg/wikidata.svg.license +++ b/assets/svg/wikidata.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikidata -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 744248e98..c60e74e61 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/svg/wikipedia.svg.license b/assets/svg/wikipedia.svg.license index fd1a25c87..ac7f7ab98 100644 --- a/assets/svg/wikipedia.svg.license +++ b/assets/svg/wikipedia.svg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Wikipedia -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/ANB.jpg.license b/assets/themes/buurtnatuur/ANB.jpg.license index 919f752bb..103696d37 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/Natuurpunt.jpg.license b/assets/themes/buurtnatuur/Natuurpunt.jpg.license index e429d2683..908dc4041 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 81a8cecc7..047a125bb 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/logo.svg.license b/assets/themes/buurtnatuur/logo.svg.license index 81a8cecc7..047a125bb 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/buurtnatuur/social_image.jpg.license b/assets/themes/buurtnatuur/social_image.jpg.license index 537a9d776..58d41f37c 100644 --- a/assets/themes/buurtnatuur/social_image.jpg.license +++ b/assets/themes/buurtnatuur/social_image.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Groen -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/charging_stations/logo.svg.license b/assets/themes/charging_stations/logo.svg.license index 0dedec0e0..22b8ca7a5 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 0dedec0e0..22b8ca7a5 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 cc83736f4..c0db94e4b 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 c56e036d8..394251dab 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-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 c56e036d8..394251dab 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license index 4ef5a8606..8e23570c5 100644 --- a/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license +++ b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: ©UNESCO-UIS 2012 http://www.uis.unesco.org -SPDX-License-Identifier: ALL-RIGHTS-RESERVED +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED diff --git a/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license b/assets/themes/speelplekken/Departement_Omgeving_Vlaanderen.png.license index 02d097f95..78dca0748 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/provincie_antwerpen.jpg.license b/assets/themes/speelplekken/provincie_antwerpen.jpg.license index f10fdfff1..620bd9003 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/shadow.geojson.license b/assets/themes/speelplekken/shadow.geojson.license index 024e83464..1816f1b36 100644 --- a/assets/themes/speelplekken/shadow.geojson.license +++ b/assets/themes/speelplekken/shadow.geojson.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Vlaamse Overheid -SPDX-License-Identifier: ALL-RIGHTS-RESERVED +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED diff --git a/assets/themes/speelplekken/social_image.jpg.license b/assets/themes/speelplekken/social_image.jpg.license index 396c5a1ee..93a623f7c 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/speelplekken/youtube.svg.license b/assets/themes/speelplekken/youtube.svg.license index 35f5b360a..430748aba 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license index 6348ee577..dec12c72d 100644 --- a/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSans-Light.woff.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Jo De Baerdemaeker -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license index 6348ee577..dec12c72d 100644 --- a/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license +++ b/assets/themes/toerisme_vlaanderen/FlandersArtSerif-Medium.woff.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Jo De Baerdemaeker -SPDX-License-Identifier: ALL-RIGHTS-RESERVED \ No newline at end of file +SPDX-License-Identifier: LicenseRef-ALL-RIGHTS-RESERVED \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/avatar.png.license b/assets/themes/toerisme_vlaanderen/avatar.png.license index 123463272..d78204695 100644 --- a/assets/themes/toerisme_vlaanderen/avatar.png.license +++ b/assets/themes/toerisme_vlaanderen/avatar.png.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Toerisme Vlaanderen -SPDX-License-Identifier: LOGO \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/logo.png.license b/assets/themes/toerisme_vlaanderen/logo.png.license index 123463272..d78204695 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 \ No newline at end of file +SPDX-License-Identifier: LicenseRef-LOGO \ No newline at end of file diff --git a/assets/themes/width/icon.svg.license b/assets/themes/width/icon.svg.license index 9c10d311a..c4b60c337 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: TRIVIAL \ No newline at end of file +SPDX-License-Identifier: LicenseRef-TRIVIAL \ No newline at end of file diff --git a/scripts/generateLicenseInfo.ts b/scripts/generateLicenseInfo.ts index 246e4c622..e2e711a3c 100644 --- a/scripts/generateLicenseInfo.ts +++ b/scripts/generateLicenseInfo.ts @@ -4,9 +4,15 @@ import ScriptUtils from "./ScriptUtils" import Script from "./Script" import { Utils } from "../src/Utils" -const prompt = require("prompt-sync")() - export class GenerateLicenseInfo extends Script { + private static readonly needsLicenseRef = new Set( + ScriptUtils.readDirRecSync("./LICENSES") + .map((p) => p.substring(p.lastIndexOf("/") + 1)) + .filter((p) => p.startsWith("LicenseRef-")) + .map((p) => p.substring("LicenseRef-".length)) + .map((p) => p.substring(0, p.lastIndexOf("."))) + ) + constructor() { super("Validates the licenses and compiles them into one single asset file") } @@ -193,11 +199,6 @@ export class GenerateLicenseInfo extends Script { */ toSPDXCompliantLicense(licenseId: string): string { licenseId = licenseId.trim() - licenseId = licenseId.replaceAll("-AND-", " AND ") - - if (!(licenseId.endsWith("-only") || licenseId.endsWith("-or-later"))) { - licenseId = licenseId.toUpperCase() - } // https://spdx.org/licenses/ const mappings: Record = { "CC-0": "CC0-1.0", @@ -362,11 +363,10 @@ export class GenerateLicenseInfo extends Script { let invalid = 0 for (const licenseInfo of licenseInfos) { - const isTrivial = - licenseInfo.license - .split(";") - .map((l) => l.trim().toLowerCase()) - .indexOf("trivial") >= 0 + const isTrivial = licenseInfo.license + .split(";") + .map((l) => l.trim().toLowerCase()) + .some((s) => s.endsWith("trivial")) if (licenseInfo.sources.length + licenseInfo.authors.length == 0 && !isTrivial) { invalid++ invalidLicenses.push( @@ -393,7 +393,11 @@ export class GenerateLicenseInfo extends Script { const spdxContent = [ "SPDX-FileCopyrightText: " + licenseInfo.authors.join("; "), - "SPDX-License-Identifier: " + licenseInfo.license, + "SPDX-License-Identifier: " + + licenseInfo.license + .split(" AND ") + .map((s) => this.addLicenseRef(s)) + .join(" AND "), ] writeFileSync(spdxPath, spdxContent.join("\n")) } @@ -410,6 +414,19 @@ export class GenerateLicenseInfo extends Script { this.cleanLicenseInfo(licensePaths, licenseInfos) this.createFullLicenseOverview(licensePaths) } + + /** + * Some licenses need "LicenseRef-" to be added to make reuse lint work + * @param s + * @private + */ + private addLicenseRef(s: string): string { + if (GenerateLicenseInfo.needsLicenseRef.has(s)) { + console.log("Mapping ", s, Array.from(GenerateLicenseInfo.needsLicenseRef)) + return "LicenseRef-" + s + } + return s + } } new GenerateLicenseInfo().run() From 1db5afbb212dc94a1e8d9a326d2da4d6571bee7e Mon Sep 17 00:00:00 2001 From: redfast00 <10746993+redfast00@users.noreply.github.com> Date: Thu, 27 Jul 2023 18:24:26 +0200 Subject: [PATCH 032/134] Make spelling of Club-Mate consistent, fix typo --- assets/layers/hackerspace/hackerspace.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index cf741f7e6..8ebf9bf87 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -207,10 +207,10 @@ { "id": "hs-club-mate", "question": { - "en": "Does this hackerspace serve Club Mate?", - "de": "Gibt es in diesem Hackerspace Club Mate?", + "en": "Does this hackerspace serve Club-Mate?", + "de": "Gibt es in diesem Hackerspace Club-Mate?", "zh_Hant": "這個駭客空間是否服務俱樂部伙伴？", - "nl": "Biedt deze hackerspace club-mate aan?" + "nl": "Biedt deze hackerspace Club-Mate aan?" }, "mappings": [ { @@ -220,10 +220,10 @@ ] }, "then": { - "en": "This hackerspace serves club mate", - "de": "In diesem Hackerspace gibt es Club Mate", + "en": "This hackerspace serves Club-Mate", + "de": "In diesem Hackerspace gibt es Club-Mate", "zh_Hant": "這個駭客空間服務俱樂部伙伴", - "nl": "Deze hackerspace biedt clube-mate aan" + "nl": "Deze hackerspace biedt Club-Mate aan" } }, { @@ -233,10 +233,10 @@ ] }, "then": { - "en": "This hackerspace does not serve club mate", - "de": "In diesem Hackerspace gibt es kein Club Mate", + "en": "This hackerspace does not serve Club-Mate", + "de": "In diesem Hackerspace gibt es kein Club-Mate", "zh_Hant": "這個駭客空間沒有服務俱樂部伙伴", - "nl": "Deze hackerspace biedt geen club-mate aan" + "nl": "Deze hackerspace biedt geen Club-Mate aan" } } ] From 5269481afc60fbbc5c568e9ef562b33009a9f7b1 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 00:46:02 +0200 Subject: [PATCH 033/134] Docs: add stack offset for featureSwitches and booleanSwitch --- src/Logic/DetermineLayout.ts | 34 +++++++++++---------------- src/Logic/State/FeatureSwitchState.ts | 2 +- src/Logic/Web/QueryParameters.ts | 9 ++++--- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/Logic/DetermineLayout.ts b/src/Logic/DetermineLayout.ts index 550b9de32..1316a241b 100644 --- a/src/Logic/DetermineLayout.ts +++ b/src/Logic/DetermineLayout.ts @@ -1,32 +1,26 @@ import LayoutConfig from "../Models/ThemeConfig/LayoutConfig" -import { QueryParameters } from "./Web/QueryParameters" -import { AllKnownLayouts } from "../Customizations/AllKnownLayouts" -import { FixedUiElement } from "../UI/Base/FixedUiElement" -import { Utils } from "../Utils" +import {QueryParameters} from "./Web/QueryParameters" +import {AllKnownLayouts} from "../Customizations/AllKnownLayouts" +import {FixedUiElement} from "../UI/Base/FixedUiElement" +import {Utils} from "../Utils" import Combine from "../UI/Base/Combine" -import { SubtleButton } from "../UI/Base/SubtleButton" +import {SubtleButton} from "../UI/Base/SubtleButton" import BaseUIElement from "../UI/BaseUIElement" -import { UIEventSource } from "./UIEventSource" -import { LocalStorageSource } from "./Web/LocalStorageSource" +import {UIEventSource} from "./UIEventSource" +import {LocalStorageSource} from "./Web/LocalStorageSource" import LZString from "lz-string" -import { FixLegacyTheme } from "../Models/ThemeConfig/Conversion/LegacyJsonConvert" -import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson" +import {FixLegacyTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert" +import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson" import known_layers from "../assets/generated/known_layers.json" -import { PrepareTheme } from "../Models/ThemeConfig/Conversion/PrepareTheme" +import {PrepareTheme} from "../Models/ThemeConfig/Conversion/PrepareTheme" import licenses from "../assets/generated/license_info.json" import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig" -import { FixImages } from "../Models/ThemeConfig/Conversion/FixImages" +import {FixImages} from "../Models/ThemeConfig/Conversion/FixImages" import Svg from "../Svg" import questions from "../assets/generated/layers/questions.json" -import { - DoesImageExist, - PrevalidateTheme, - ValidateTagRenderings, - ValidateThemeAndLayers, -} from "../Models/ThemeConfig/Conversion/Validation" -import { DesugaringContext } from "../Models/ThemeConfig/Conversion/Conversion" -import { RewriteSpecial } from "../Models/ThemeConfig/Conversion/PrepareLayer" -import { TagRenderingConfigJson } from "../Models/ThemeConfig/Json/TagRenderingConfigJson" +import {DoesImageExist, PrevalidateTheme, ValidateThemeAndLayers,} from "../Models/ThemeConfig/Conversion/Validation" +import {DesugaringContext} from "../Models/ThemeConfig/Conversion/Conversion" +import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson" import Hash from "./Web/Hash" export default class DetermineLayout { diff --git a/src/Logic/State/FeatureSwitchState.ts b/src/Logic/State/FeatureSwitchState.ts index 50fe731ea..852075b26 100644 --- a/src/Logic/State/FeatureSwitchState.ts +++ b/src/Logic/State/FeatureSwitchState.ts @@ -10,7 +10,7 @@ import { Utils } from "../../Utils" class FeatureSwitchUtils { static initSwitch(key: string, deflt: boolean, documentation: string): UIEventSource { const defaultValue = deflt - const queryParam = QueryParameters.GetQueryParameter(key, "" + defaultValue, documentation) + const queryParam = QueryParameters.GetQueryParameter(key, "" + defaultValue, documentation, {stackOffset: -1}) // It takes the current layout, extracts the default value for this query parameter. A query parameter event source is then retrieved and flattened return queryParam.sync( diff --git a/src/Logic/Web/QueryParameters.ts b/src/Logic/Web/QueryParameters.ts index 446982b49..9a05548a0 100644 --- a/src/Logic/Web/QueryParameters.ts +++ b/src/Logic/Web/QueryParameters.ts @@ -17,14 +17,17 @@ export class QueryParameters { public static GetQueryParameter( key: string, deflt: string, - documentation?: string + documentation?: string, + options?: { + stackOffset?: number + } ): UIEventSource { if (!this.initialized) { this.init() } if (Utils.runningFromConsole) { - const location = Utils.getLocationInCode(-1) + const location = Utils.getLocationInCode(-1 + (options?.stackOffset ?? 0)) documentation += "\n\nThis documentation is defined in the source code at [" + @@ -63,7 +66,7 @@ export class QueryParameters { documentation?: string ): UIEventSource { return UIEventSource.asBoolean( - QueryParameters.GetQueryParameter(key, "" + deflt, documentation) + QueryParameters.GetQueryParameter(key, "" + deflt, documentation, {stackOffset: -1}) ) } From 7d51c94e1fe820b76f7bca07446f6ac397a1b770 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 01:02:31 +0200 Subject: [PATCH 034/134] Chore: housekeeping --- Docs/Layers/climbing_opportunity.md | 1 + Docs/Layers/climbing_route.md | 1 + Docs/Themes/elongated_coin.md | 1 + Docs/Themes/postboxes.md | 2 +- Docs/Themes/vending_machine.md | 1 + Docs/wikiIndex.txt | 4 +- .../mapcomplete-changes.json | 97 +-- package-lock.json | 16 +- src/Models/FilteredLayer.ts | 20 +- src/UI/BigComponents/ThemeButton.svelte | 2 +- src/UI/BigComponents/ThemesList.svelte | 2 +- src/UI/Input/FileSelectorButton.ts | 18 +- src/UI/Map/MaplibreMap.svelte | 116 ++- src/UI/Map/ShowDataLayer.ts | 10 +- .../Popup/TagRendering/FreeformInput.svelte | 2 +- src/UI/ThemeViewGUI.svelte | 2 +- src/Utils.ts | 48 +- src/assets/contributors.json | 4 +- src/assets/language_native.json | 2 +- src/assets/language_translations.json | 678 ++++++++++++------ src/assets/translators.json | 22 +- 21 files changed, 622 insertions(+), 427 deletions(-) diff --git a/Docs/Layers/climbing_opportunity.md b/Docs/Layers/climbing_opportunity.md index 8571a8e35..d74f8e347 100644 --- a/Docs/Layers/climbing_opportunity.md +++ b/Docs/Layers/climbing_opportunity.md @@ -15,6 +15,7 @@ Fallback layer with items on which climbing _might_ be possible. It is loaded wh - This layer is shown at zoomlevel **19** and higher + - This layer is needed as dependency for layer [climbing_route](#climbing_route) diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md index a653ad7dc..d7954a80d 100644 --- a/Docs/Layers/climbing_route.md +++ b/Docs/Layers/climbing_route.md @@ -15,6 +15,7 @@ A single climbing route and its properties. Some properties are derived from the - This layer is shown at zoomlevel **18** and higher + - This layer will automatically load [climbing_opportunity](./climbing_opportunity.md) into the layout as it depends on it: a preset snaps to this layer (presets[0]) - This layer is needed as dependency for layer [climbing_area](#climbing_area) diff --git a/Docs/Themes/elongated_coin.md b/Docs/Themes/elongated_coin.md index d97276055..71f36aaaf 100644 --- a/Docs/Themes/elongated_coin.md +++ b/Docs/Themes/elongated_coin.md @@ -26,6 +26,7 @@ Available languages: - en + - de This document is autogenerated from [assets/themes/elongated_coin/elongated_coin.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/elongated_coin/elongated_coin.json) diff --git a/Docs/Themes/postboxes.md b/Docs/Themes/postboxes.md index 058e31594..c91727b8a 100644 --- a/Docs/Themes/postboxes.md +++ b/Docs/Themes/postboxes.md @@ -5,7 +5,7 @@ -On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. +On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. This theme contains the following layers: diff --git a/Docs/Themes/vending_machine.md b/Docs/Themes/vending_machine.md index 191619c47..05f60d746 100644 --- a/Docs/Themes/vending_machine.md +++ b/Docs/Themes/vending_machine.md @@ -27,6 +27,7 @@ Available languages: - en - nl + - de This document is autogenerated from [assets/themes/vending_machine/vending_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/vending_machine/vending_machine.json) diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index 3611a1924..4d55c0aeb 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -247,7 +247,7 @@ {{service_item |name= [https://mapcomplete.osm.be/elongated_coin elongated_coin] |region= Worldwide -|lang= {{#language:en|en}} +|lang= {{#language:en|en}}, {{#language:de|en}} |descr= A MapComplete theme: Find penny presses to create your own elongated coins |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png @@ -499,7 +499,7 @@ {{service_item |name= [https://mapcomplete.osm.be/vending_machine vending_machine] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:nl|en}} +|lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:de|en}} |descr= A MapComplete theme: Find vending machines for everything |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index deda66b65..56555e871 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "nl": "Toon wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -26,9 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "nl": "Centerpunt van changeset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -39,51 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung gemacht von {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -92,27 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Sprache wurde diese Änderung vorgenommen?", - "nl": "In welke locale (taal) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Usersprache ist {locale}", - "nl": "De gebruikerstaal is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "de": "Änderung vorgenommen mit {host}", - "nl": "Wijziging gemaakt met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -133,12 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -480,9 +452,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themenaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -498,9 +468,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -516,9 +484,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -535,9 +501,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -554,9 +518,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -572,9 +534,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "nl": "De taal van de bijdrager is {search}" + "en": "User language (iso-code) {search}" } } ] @@ -590,9 +550,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -603,9 +561,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Changeset fügte mindestens ein Bild hinzu", - "nl": "Changeset bevat minstens één afbeelding" + "en": "Changeset added at least one image" } } ] @@ -620,8 +576,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier" + "en": "More statistics can be found here" } }, { diff --git a/package-lock.json b/package-lock.json index 69493ba47..c7f7e025f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.31.0", + "version": "0.31.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.31.0", + "version": "0.31.1", "license": "GPL-3.0-or-later", "dependencies": { "@rgossiaux/svelte-headlessui": "^1.0.2", @@ -4511,9 +4511,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001516", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001516.tgz", - "integrity": "sha512-Wmec9pCBY8CWbmI4HsjBeQLqDTqV91nFVR83DnZpYyRnPI1wePDsTg0bGLPC5VU/3OIZV1fmxEea1b+tFKe86g==", + "version": "1.0.30001517", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz", + "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==", "dev": true, "funding": [ { @@ -15736,9 +15736,9 @@ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" }, "caniuse-lite": { - "version": "1.0.30001516", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001516.tgz", - "integrity": "sha512-Wmec9pCBY8CWbmI4HsjBeQLqDTqV91nFVR83DnZpYyRnPI1wePDsTg0bGLPC5VU/3OIZV1fmxEea1b+tFKe86g==", + "version": "1.0.30001517", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz", + "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==", "dev": true }, "canvg": { diff --git a/src/Models/FilteredLayer.ts b/src/Models/FilteredLayer.ts index 76fd8e57c..9b9de7b99 100644 --- a/src/Models/FilteredLayer.ts +++ b/src/Models/FilteredLayer.ts @@ -1,14 +1,14 @@ -import {Store, UIEventSource} from "../Logic/UIEventSource" +import { Store, UIEventSource } from "../Logic/UIEventSource" import LayerConfig from "./ThemeConfig/LayerConfig" -import {OsmConnection} from "../Logic/Osm/OsmConnection" -import {LocalStorageSource} from "../Logic/Web/LocalStorageSource" -import {QueryParameters} from "../Logic/Web/QueryParameters" -import {FilterConfigOption} from "./ThemeConfig/FilterConfig" -import {TagsFilter} from "../Logic/Tags/TagsFilter" -import {Utils} from "../Utils" -import {TagUtils} from "../Logic/Tags/TagUtils" -import {And} from "../Logic/Tags/And" -import {GlobalFilter} from "./GlobalFilter" +import { OsmConnection } from "../Logic/Osm/OsmConnection" +import { LocalStorageSource } from "../Logic/Web/LocalStorageSource" +import { QueryParameters } from "../Logic/Web/QueryParameters" +import { FilterConfigOption } from "./ThemeConfig/FilterConfig" +import { TagsFilter } from "../Logic/Tags/TagsFilter" +import { Utils } from "../Utils" +import { TagUtils } from "../Logic/Tags/TagUtils" +import { And } from "../Logic/Tags/And" +import { GlobalFilter } from "./GlobalFilter" export default class FilteredLayer { /** diff --git a/src/UI/BigComponents/ThemeButton.svelte b/src/UI/BigComponents/ThemeButton.svelte index 4bade4f68..cc8c5d772 100644 --- a/src/UI/BigComponents/ThemeButton.svelte +++ b/src/UI/BigComponents/ThemeButton.svelte @@ -7,7 +7,7 @@ import type { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig" import Tr from "../Base/Tr.svelte" import SubtleLink from "../Base/SubtleLink.svelte" - import Translations from "../i18n/Translations" + import Translations from "../i18n/Translations" export let theme: LayoutInformation export let isCustom: boolean = false diff --git a/src/UI/BigComponents/ThemesList.svelte b/src/UI/BigComponents/ThemesList.svelte index 893a15d11..23fc2e141 100644 --- a/src/UI/BigComponents/ThemesList.svelte +++ b/src/UI/BigComponents/ThemesList.svelte @@ -29,7 +29,7 @@
{#each filteredThemes as theme (theme.id)} {#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)} - + {#if theme === firstTheme && !isCustom && $search !== "" && $search !== undefined} { if (actualInputElement.files !== null) { self._value.setData(actualInputElement.files) } - actualInputElement.classList.remove("glowing-shadow"); + actualInputElement.classList.remove("glowing-shadow") e.preventDefault() }) el.appendChild(actualInputElement) - function setDrawAttention(isOn: boolean){ - if(isOn){ + function setDrawAttention(isOn: boolean) { + if (isOn) { label.classList.add("glowing-shadow") - - }else{ + } else { label.classList.remove("glowing-shadow") - } } @@ -90,10 +88,9 @@ export default class FileSelectorButton extends InputElement { setDrawAttention(true) // Style the drag-and-drop as a "copy file" operation. event.dataTransfer.dropEffect = "copy" - }) - window.document.addEventListener("dragenter", () =>{ + window.document.addEventListener("dragenter", () => { setDrawAttention(true) }) @@ -101,7 +98,6 @@ export default class FileSelectorButton extends InputElement { setDrawAttention(false) }) - el.addEventListener("drop", (event) => { event.stopPropagation() event.preventDefault() diff --git a/src/UI/Map/MaplibreMap.svelte b/src/UI/Map/MaplibreMap.svelte index 268a12cbd..bb03350d2 100644 --- a/src/UI/Map/MaplibreMap.svelte +++ b/src/UI/Map/MaplibreMap.svelte @@ -1,79 +1,73 @@ - + -
- - + height: 100%;" +/> diff --git a/src/UI/Map/ShowDataLayer.ts b/src/UI/Map/ShowDataLayer.ts index 9ed7e92a3..876e6adec 100644 --- a/src/UI/Map/ShowDataLayer.ts +++ b/src/UI/Map/ShowDataLayer.ts @@ -161,13 +161,16 @@ class PointRenderingLayer { }) } - const marker = new Marker({ element: el}).setLngLat(loc).setOffset(iconAnchor).addTo(this._map) + const marker = new Marker({ element: el }) + .setLngLat(loc) + .setOffset(iconAnchor) + .addTo(this._map) store .map((tags) => this._config.pitchAlignment.GetRenderValue(tags).Subs(tags).txt) - .addCallbackAndRun((pitchAligment) => marker.setPitchAlignment( pitchAligment)) + .addCallbackAndRun((pitchAligment) => marker.setPitchAlignment(pitchAligment)) store .map((tags) => this._config.rotationAlignment.GetRenderValue(tags).Subs(tags).txt) - .addCallbackAndRun((pitchAligment) => marker.setRotationAlignment( pitchAligment)) + .addCallbackAndRun((pitchAligment) => marker.setRotationAlignment(pitchAligment)) if (feature.geometry.type === "Point") { // When the tags get 'pinged', check that the location didn't change store.addCallbackAndRunD(() => { @@ -458,7 +461,6 @@ export default class ShowDataLayer { features: FeatureSource, doShowLayer?: Store ): ShowDataLayer { - return new ShowDataLayer(map, { layer: ShowDataLayer.rangeLayer, features, diff --git a/src/UI/Popup/TagRendering/FreeformInput.svelte b/src/UI/Popup/TagRendering/FreeformInput.svelte index f3ccbdee4..3d7b344a3 100644 --- a/src/UI/Popup/TagRendering/FreeformInput.svelte +++ b/src/UI/Popup/TagRendering/FreeformInput.svelte @@ -38,7 +38,7 @@ } -
+
{#if inline} - +
diff --git a/src/Utils.ts b/src/Utils.ts index 3ff3c59bb..df6be702f 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -1,5 +1,5 @@ import colors from "./assets/colors.json" -import {HTMLElement} from "node-html-parser" +import { HTMLElement } from "node-html-parser" export class Utils { /** @@ -459,7 +459,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be let match = txt.match(regex) - if(!match){ + if (!match) { return txt } let result = "" @@ -502,7 +502,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be result += normal + v match = leftover.match(regex) - if(!match){ + if (!match) { result += leftover } } @@ -699,10 +699,10 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be if (Array.isArray(leaf)) { for (let i = 0; i < (leaf).length; i++) { const l = (leaf)[i] - collectedList.push({leaf: l, path: [...travelledPath, "" + i]}) + collectedList.push({ leaf: l, path: [...travelledPath, "" + i] }) } } else { - collectedList.push({leaf, path: travelledPath}) + collectedList.push({ leaf, path: travelledPath }) } return collectedList } @@ -780,7 +780,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be }) } - const cp = {...json} + const cp = { ...json } for (const key in json) { cp[key] = Utils.WalkJson(json[key], f, isLeaf, [...path, key]) } @@ -910,11 +910,11 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be const xhr = new XMLHttpRequest() xhr.onload = () => { if (xhr.status == 200) { - resolve({content: xhr.response}) + resolve({ content: xhr.response }) } else if (xhr.status === 302) { - resolve({redirect: xhr.getResponseHeader("location")}) + resolve({ redirect: xhr.getResponseHeader("location") }) } else if (xhr.status === 509 || xhr.status === 429) { - resolve({error: "rate limited", url, statuscode: xhr.status}) + resolve({ error: "rate limited", url, statuscode: xhr.status }) } else { resolve({ error: "other error: " + xhr.statusText, @@ -984,10 +984,10 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be } const promise = /*NO AWAIT as we work with the promise directly */ Utils.downloadJsonAdvanced( - url, - headers - ) - Utils._download_cache.set(url, {promise, timestamp: new Date().getTime()}) + url, + headers + ) + Utils._download_cache.set(url, { promise, timestamp: new Date().getTime() }) return await promise } @@ -1006,11 +1006,11 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be const injected = Utils.injectedDownloads[url] if (injected !== undefined) { console.log("Using injected resource for test for URL", url) - return new Promise((resolve, _) => resolve({content: injected})) + return new Promise((resolve, _) => resolve({ content: injected })) } const result = await Utils.downloadAdvanced( url, - Utils.Merge({accept: "application/json"}, headers ?? {}) + Utils.Merge({ accept: "application/json" }, headers ?? {}) ) if (result["error"] !== undefined) { return <{ error: string; url: string; statuscode?: number }>result @@ -1018,12 +1018,12 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be const data = result["content"] try { if (typeof data === "string") { - return {content: JSON.parse(data)} + return { content: JSON.parse(data) } } - return {content: data} + return { content: data } } catch (e) { console.error("Could not parse ", data, "due to", e, "\n", e.stack) - return {error: "malformed", url} + return { error: "malformed", url } } } @@ -1047,7 +1047,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be const element = document.createElement("a") let file if (typeof contents === "string") { - file = new Blob([contents], {type: options?.mimetype ?? "text/plain"}) + file = new Blob([contents], { type: options?.mimetype ?? "text/plain" }) } else { file = contents } @@ -1318,7 +1318,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be if (match == undefined) { return undefined } - return {r: Number(match[1]), g: Number(match[2]), b: Number(match[3])} + return { r: Number(match[1]), g: Number(match[2]), b: Number(match[3]) } } if (!hex.startsWith("#")) { @@ -1378,7 +1378,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be if (inView) { return } - element.scrollIntoView({behavior: "smooth", block: "nearest"}) + element.scrollIntoView({ behavior: "smooth", block: "nearest" }) } public static findParentWithScrolling(element: HTMLBaseElement): HTMLBaseElement { @@ -1470,12 +1470,12 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be const postParts = prepart.split("}") if (postParts.length === 1) { // This was a normal part - spec.push({message: postParts[0]}) + spec.push({ message: postParts[0] }) } else { const [subs, message] = postParts - spec.push({subs}) + spec.push({ subs }) if (message !== "") { - spec.push({message}) + spec.push({ message }) } } } diff --git a/src/assets/contributors.json b/src/assets/contributors.json index 0996f5e8a..2a7fc54dd 100644 --- a/src/assets/contributors.json +++ b/src/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 5753, + "commits": 5819, "contributor": "Pieter Vander Vennet" }, { - "commits": 371, + "commits": 384, "contributor": "Robin van der Linde" }, { diff --git a/src/assets/language_native.json b/src/assets/language_native.json index aad2e6555..49cf3dbdf 100644 --- a/src/assets/language_native.json +++ b/src/assets/language_native.json @@ -10,7 +10,7 @@ "fr": "français", "gl": "lingua galega", "hu": "magyar", - "id": "bahasa Indonesia", + "id": "Bahasa Indonesia", "it": "italiano", "ja": "日本語", "nb_NO": "bokmål", diff --git a/src/assets/language_translations.json b/src/assets/language_translations.json index c20af4ce3..3d3ca49e2 100644 --- a/src/assets/language_translations.json +++ b/src/assets/language_translations.json @@ -90,6 +90,28 @@ ] } }, + "acm": { + "ca": "àrab mesopotàmic", + "de": "Irakisch-Arabisch", + "en": "Mesopotamian Arabic", + "eo": "Mezopotamia araba dialekto", + "es": "árabe mesopotámico", + "fr": "arabe mésopotamien", + "id": "Bahasa Arab Mesopotamia", + "ja": "アラビア語イラク方言", + "nl": "Mesopotamisch-Arabisch", + "pl": "Dialekty mezopotamskie języka arabskiego", + "pt": "Árabe iraquiano", + "pt_BR": "Árabe iraquiano", + "ru": "иракский диалект арабского языка", + "sl": "mezopotamska arabščina", + "sv": "irakisk arabiska", + "_meta": { + "dir": [ + "right-to-left" + ] + } + }, "adx": { "en": "Amdo Tibetan", "fr": "tibétain de l'Amdo", @@ -98,6 +120,7 @@ "pl": "Język amdo", "pt": "Tibetano Amdo", "ru": "амдо", + "sv": "ambdotibetanska", "_meta": { "dir": [ "left-to-right" @@ -123,6 +146,7 @@ "pl": "język adygejski", "pt": "língua adigue", "ru": "адыгейский язык", + "sl": "adigejščina", "sv": "adygeiska", "zh_Hans": "阿迪格语", "zh_Hant": "阿迪格語", @@ -152,6 +176,7 @@ "pt": "árabe tunisino", "pt_BR": "Árabe tunisino", "ru": "Тунисский диалект арабского языка", + "sl": "tunizijska arabščina", "sv": "tunisisk arabiska", "zh_Hans": "突尼斯阿拉伯语", "zh_Hant": "突尼西亞阿拉伯語", @@ -183,7 +208,7 @@ "pt": "língua africâner", "pt_BR": "língua africâner", "ru": "африкаанс", - "sl": "Afrikanščina", + "sl": "afrikanščina", "sv": "afrikaans", "zh_Hans": "南非语", "zh_Hant": "南非語", @@ -205,6 +230,7 @@ "gl": "Lingua aghem", "ja": "アゲム語", "nl": "Aghem", + "sv": "aghem", "_meta": { "dir": [ "left-to-right" @@ -226,10 +252,12 @@ "pl": "dialekty syryjsko-palestyńskie języka arabskiego", "pt": "Árabe levantino", "ru": "Левантийский диалект арабского языка", - "sv": "Nordlevantinsk arabiska", + "sl": "levantinska arabščina", + "sv": "nordlevantinsk arabiska", "_meta": { "dir": [ - "right-to-left" + "right-to-left", + "left-to-right" ] } }, @@ -275,6 +303,7 @@ "ja": "アクラノン語", "pl": "Język aklanon", "pt": "Língua aklan", + "sv": "aklan", "_meta": { "dir": [ "left-to-right" @@ -295,6 +324,7 @@ "nl": "Alabama", "pl": "język alabama", "ru": "Алабамский язык", + "sv": "alabama", "_meta": { "dir": [ "left-to-right" @@ -367,6 +397,7 @@ "nb_NO": "Søraltaisk", "nl": "Zuid-Altajs", "ru": "aлтайский язык", + "sv": "sydaltaiska", "zh_Hant": "南阿爾泰語", "_meta": { "dir": [ @@ -408,6 +439,30 @@ ] } }, + "ami": { + "ca": "amis", + "de": "Amisisch", + "en": "Amis", + "es": "idioma amis", + "fi": "Amisin kieli", + "fr": "amis", + "gl": "Lingua amis", + "id": "Bahasa Amis", + "it": "lingua amis", + "ja": "アミ語", + "nl": "Amis", + "pl": "Język amis", + "pt": "língua amis", + "ru": "амисский язык", + "sv": "amis", + "zh_Hans": "阿美语", + "zh_Hant": "阿美語", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "an": { "ca": "aragonès", "cs": "aragonština", @@ -429,6 +484,7 @@ "pt": "Língua aragonesa", "pt_BR": "Língua aragonesa", "ru": "арагонский язык", + "sl": "aragonščina", "sv": "aragonska", "zh_Hans": "阿拉贡语", "zh_Hant": "亞拉岡語", @@ -442,6 +498,7 @@ "cs": "angština", "de": "Angika", "en": "Angika", + "eo": "angika", "es": "Idioma angika", "fi": "Angika", "fr": "angika", @@ -451,6 +508,7 @@ "nl": "Angika", "pt": "Língua angika", "ru": "ангика", + "sv": "angika", "zh_Hans": "昂加语", "zh_Hant": "昂加語", "_meta": { @@ -473,6 +531,7 @@ "pt": "Língua taurepangue", "pt_BR": "Língua taurepangue", "ru": "Пемонский язык", + "sv": "pemon", "_meta": { "dir": [ "left-to-right" @@ -494,10 +553,12 @@ "pl": "dialekty syryjsko-palestyńskie języka arabskiego", "pt": "Árabe levantino", "ru": "Левантийский диалект арабского языка", - "sv": "Nordlevantinsk arabiska", + "sl": "levantinska arabščina", + "sv": "nordlevantinsk arabiska", "_meta": { "dir": [ - "right-to-left" + "right-to-left", + "left-to-right" ] } }, @@ -581,6 +642,8 @@ "ru": "мапуче", "sl": "Mapudungun", "sv": "mapudungun", + "zh_Hans": "马普切语", + "zh_Hant": "馬普切語", "_meta": { "dir": [ "left-to-right" @@ -596,6 +659,7 @@ "es": "árabe argelino", "fi": "algerianarabia", "fr": "arabe algérien", + "gl": "Árabe alxeriano", "hu": "algériai arab", "id": "Bahasa Arab Aljazair", "it": "arabo algerino", @@ -604,6 +668,7 @@ "nl": "Algerijns Arabisch", "pt": "árabe argelino", "ru": "Алжирский диалект арабского языка", + "sl": "alžirska arabščina", "sv": "algerisk arabiska", "zh_Hant": "阿爾及利亞阿拉伯語", "_meta": { @@ -617,11 +682,11 @@ "cs": "Marocká arabština", "da": "Marokkansk arabisk", "de": "Marokkanisch-Arabisch", - "en": "Moroccan Arabic", + "en": "Moroccan Darija", "eo": "maroka araba lingvo", "es": "árabe marroquí", - "fi": "Marokonarabia", - "fr": "arabe marocain", + "fi": "marokonarabia", + "fr": "Darija marocain", "gl": "árabe marroquí", "id": "Bahasa Arab Maroko", "it": "arabo marocchino", @@ -631,6 +696,7 @@ "pl": "marokańska odmiana języka arabskiego", "pt": "Árabe marroquino", "ru": "Марокканский диалект арабского языка", + "sl": "maroška arabščina", "sv": "marockansk arabiska", "zh_Hant": "摩洛哥阿拉伯語", "_meta": { @@ -660,6 +726,7 @@ "pt": "árabe egípcio", "pt_BR": "Árabe egípcio", "ru": "египетский диалект арабского языка", + "sl": "egiptovska arabščina", "sv": "egyptisk arabiska", "zh_Hant": "埃及阿拉伯語", "_meta": { @@ -688,6 +755,7 @@ "pl": "język asamski", "pt": "língua assamesa", "ru": "ассамский язык", + "sl": "asamščina", "sv": "assamesiska", "zh_Hant": "阿薩姆語", "_meta": { @@ -706,7 +774,7 @@ "es": "lengua de señas estadounidense", "fi": "amerikkalainen viittomakieli", "fr": "langue des signes américaine", - "gl": "Lingua de signos americana", + "gl": "lingua de signos americana", "id": "Bahasa Isyarat Amerika", "it": "lingua dei segni americana", "ja": "アメリカ手話", @@ -714,7 +782,7 @@ "nl": "Amerikaanse Gebarentaal", "pl": "amerykański język migowy", "pt": "língua de sinais americana", - "pt_BR": "Língua de sinais americana", + "pt_BR": "língua de sinais americana", "ru": "амслен", "sv": "amerikanskt teckenspråk", "zh_Hant": "美國手語", @@ -746,6 +814,7 @@ "pt": "asturiano", "pt_BR": "Língua asturiana", "ru": "астурийский язык", + "sl": "asturščina", "sv": "asturiska", "zh_Hans": "阿斯图里亚斯语", "zh_Hant": "阿斯圖里亞斯語", @@ -770,6 +839,7 @@ "nl": "Atikamekw", "pt": "Língua atikamekw", "ru": "aтикамек", + "sv": "atikamekw", "zh_Hans": "阿提卡米克语", "zh_Hant": "阿提卡米克語", "_meta": { @@ -809,6 +879,7 @@ "ca": "Avadhi", "de": "Awadhi", "en": "Awadhi", + "eo": "avadhia", "es": "awadhi", "fi": "Awadhin kieli", "fr": "awadhi", @@ -935,6 +1006,7 @@ "ban": { "ca": "balinès", "cs": "balijština", + "da": "balinesisk", "de": "Balinesisch", "en": "Balinese", "eo": "balia lingvo", @@ -951,6 +1023,7 @@ "pt": "balinês", "pt_BR": "Língua balinesa", "ru": "Балийский язык", + "sl": "balijščina", "sv": "balinesiska", "zh_Hans": "巴厘语", "zh_Hant": "峇里語", @@ -980,7 +1053,7 @@ "pl": "dialekt bawarski", "pt": "língua bávara", "ru": "австро-баварский язык", - "sl": "Bavarščina", + "sl": "bavarščina", "sv": "bayerska", "zh_Hans": "奥地利-巴伐利亚德语", "zh_Hant": "奧地利-巴伐利亞德語", @@ -1010,6 +1083,7 @@ "pl": "język żmudzki", "pt": "Samogiciano", "ru": "жемайтское наречие", + "sl": "samogitščina", "sv": "žemaitiska", "zh_Hans": "萨莫吉提亚语", "zh_Hant": "薩莫吉提亞語", @@ -1024,7 +1098,7 @@ "cs": "Batak Toba", "da": "Batak Toba", "de": "Toba Batak", - "en": "Batak Toba", + "en": "Toba Batak", "eo": "Batak Toba", "es": "Batak Toba", "fi": "Batak Toba", @@ -1052,7 +1126,10 @@ "de": "West Coast Bajau", "en": "West Coast Bajau", "fr": "bajau de la côte occidentale", + "gl": "Lingua bajaw da costa occidental", "nb_NO": "vestkystbajau", + "ru": "баджо западного побережья", + "sv": "västkustbajau", "_meta": { "dir": [ "left-to-right" @@ -1075,6 +1152,7 @@ "pl": "Język bedża", "pt": "Língua beja", "ru": "Беджа", + "sv": "beja", "_meta": { "dir": [ "right-to-left", @@ -1087,12 +1165,13 @@ "de": "Britische Gebärdensprache", "en": "British Sign Language", "eo": "brita signolingvo", - "es": "Lengua de señas británica", + "es": "lengua de señas británica", "fi": "brittiläinen viittomakieli", "fr": "langue des signes britannique", "id": "Bahasa Isyarat Britania", "it": "lingua dei segni britannica", "ja": "イギリス手話", + "nb_NO": "britisk tegnspråk", "nl": "Britse gebarentaal", "pl": "brytyjski język migowy", "pt": "língua de sinais britânica", @@ -1100,6 +1179,7 @@ "sv": "brittiskt teckenspråk", "_meta": { "dir": [ + "left-to-right", "vertical left-to-right" ] } @@ -1247,6 +1327,7 @@ } }, "bla": { + "ca": "blackfoot", "de": "Blackfoot", "en": "Blackfoot", "eo": "nigrapieda lingvo", @@ -1254,6 +1335,7 @@ "fi": "Mustajalka", "fr": "pied-noir", "gl": "Lingua siksiká", + "id": "Bahasa Blackfoot", "it": "lingua blackfoot", "ja": "ブラックフット語", "nb_NO": "blackfoot", @@ -1282,7 +1364,7 @@ "gl": "Lingua bambara", "hu": "bambara", "id": "Bahasa Bambara", - "it": "bambara", + "it": "Bambara", "ja": "バンバラ語", "nb_NO": "bambara", "nl": "Bambara", @@ -1301,7 +1383,7 @@ "ca": "bengalí", "cs": "bengálština", "da": "bengali", - "de": "Bengali", + "de": "Bengalisch", "en": "Bengali", "eo": "bengala lingvo", "es": "bengalí", @@ -1343,6 +1425,7 @@ "pl": "Język bunun", "pt": "Língua bunun", "ru": "Бунун", + "sv": "bunun", "zh_Hant": "布農語", "_meta": { "dir": [ @@ -1371,6 +1454,7 @@ "pt": "Língua tibetana", "pt_BR": "Língua tibetana", "ru": "тибетский язык", + "sl": "tibetanščina", "sv": "tibetanska", "_meta": { "dir": [ @@ -1380,10 +1464,10 @@ }, "bpy": { "ca": "bishnupriya manipuri", - "cs": "Bišnuprijskomanipurština", + "cs": "bišnuprijskomanipurština", "de": "Bishnupriya Manipuri", "en": "Bishnupriya Manipuri", - "eo": "Biŝnuprija Manipuri lingvo", + "eo": "biŝnuprija manipura lingvo", "es": "Bishnupriya manipurí", "fi": "Bishnupriya Manipuri", "fr": "manipourî de Bishnupriyay", @@ -1407,13 +1491,14 @@ }, "bqi": { "de": "Bachtiarisch", - "en": "Bakhtiari-Hakhamanesh", + "en": "Bakhtiari dialect", "fr": "bakhtiari", "it": "dialetto Bakhtiari-Hakhamanesh", "ja": "バフティヤーリー語", "nl": "Bachtiarisch", "pl": "Język bachtiarski", "ru": "Бахтиярский язык", + "sv": "bakhtiari", "zh_Hans": "巴赫蒂亚语", "zh_Hant": "巴赫蒂亞語", "_meta": { @@ -1443,7 +1528,7 @@ "pt": "bretão", "pt_BR": "língua bretã", "ru": "бретонский язык", - "sl": "Bretonščina", + "sl": "bretonščina", "sv": "bretonska", "zh_Hant": "布列塔尼語", "_meta": { @@ -1489,6 +1574,7 @@ "nl": "Abinomn", "pl": "Język abinomn", "ru": "абиномн", + "sv": "abinomn", "_meta": { "dir": [ "left-to-right" @@ -1532,6 +1618,7 @@ "gl": "Lingua akoose", "ja": "アコース語", "nl": "Bakossi", + "sv": "akoose", "_meta": { "dir": [ "left-to-right" @@ -1539,12 +1626,13 @@ } }, "btm": { - "cs": "mandailing", + "cs": "Mandailing", "en": "Mandailing", "fr": "batak mandailing", - "id": "Mandailing", + "id": "Bahasa Batak Mandailing", "ja": "バタク・マンダイリン語", "pl": "język batak mandailing", + "sv": "mandailing", "zh_Hans": "曼代灵语", "zh_Hant": "曼代靈語", "_meta": { @@ -1624,6 +1712,7 @@ "pt": "língua brasileira de sinais", "pt_BR": "língua brasileira de sinais", "ru": "бразильский жестовый язык", + "sv": "brasilianskt teckenspråk", "_meta": { "dir": [ "vertical left-to-right" @@ -1642,7 +1731,7 @@ "fr": "catalan", "gl": "lingua catalá", "hu": "katalán", - "id": "Bahasa Katala", + "id": "bahasa Katala", "it": "catalano", "ja": "カタルーニャ語", "nb_NO": "katalansk", @@ -1651,7 +1740,7 @@ "pt": "língua catalã", "pt_BR": "língua catalã", "ru": "каталанский язык", - "sl": "Katalonščina", + "sl": "katalonščina", "sv": "katalanska", "zh_Hans": "加泰罗尼亚语", "zh_Hant": "加泰隆尼亞語", @@ -1713,14 +1802,15 @@ "ccp": { "de": "Chakma", "en": "Chakma", - "eo": "Ĉakma lingvo", + "eo": "ĉakma lingvo", "fr": "changma kodha", "ja": "チャクマ語", "nl": "Chakma", - "pl": "Język czakma", - "pt": "Língua chakma", - "pt_BR": "Língua chakma", - "ru": "Чакма", + "pl": "język czakma", + "pt": "língua chakma", + "pt_BR": "língua chakma", + "ru": "чакма", + "sv": "chakma", "_meta": { "dir": [ "left-to-right" @@ -1750,7 +1840,8 @@ "zh_Hant": "閩東語", "_meta": { "dir": [ - "top-to-bottom" + "top-to-bottom", + "left-to-right" ] } }, @@ -1852,6 +1943,7 @@ "nl": "Chinook Jargon", "pt": "Jargão chinook", "ru": "чинукский жаргон", + "sv": "chinookjargong", "zh_Hans": "奇努克混合语", "zh_Hant": "支努幹混合語", "_meta": { @@ -1865,19 +1957,19 @@ "cs": "čoktština", "de": "Choctaw", "en": "Choctaw", - "eo": "Ĉakta lingvo", + "eo": "ĉakta lingvo", "es": "idioma choctaw", "fi": "Choctawin kieli", "fr": "choctaw", - "gl": "Lingua choctaw", + "gl": "lingua choctaw", "hu": "csaktó", "id": "Bahasa Choctaw", "it": "lingua choctaw", "ja": "チョクトー語", "nb_NO": "choctaw", "nl": "Choctaw", - "pl": "Język czoktaw", - "pt": "Língua choctaw", + "pl": "język czoktaw", + "pt": "língua choctaw", "ru": "Чоктавский язык", "sv": "choctaw", "zh_Hans": "乔克托语", @@ -1927,6 +2019,7 @@ "fr": "cheyenne", "gl": "Lingua cheyenne", "hu": "cheyenne", + "id": "Bahasa Cheyenne", "it": "cheyenne", "ja": "シャイアン語", "nb_NO": "Cheyenne", @@ -1934,6 +2027,7 @@ "pl": "język czejeński", "pt": "Língua cheyenne", "ru": "шайенский язык", + "sv": "cheyenne", "zh_Hans": "夏延语", "zh_Hant": "夏安語", "_meta": { @@ -2004,6 +2098,7 @@ "fr": "haka chin", "ja": "ハカ語", "ru": "Чинский язык", + "sv": "hakha-chin", "_meta": { "dir": [ "left-to-right" @@ -2047,6 +2142,7 @@ "pl": "Język puxian", "pt": "Língua putian", "ru": "Пусяньский язык", + "sv": "pu-xian-min", "zh_Hans": "莆仙语", "zh_Hant": "莆仙語", "_meta": { @@ -2074,6 +2170,7 @@ "pl": "język kri", "pt": "Língua cree", "ru": "кри", + "sl": "krijščina", "sv": "cree", "_meta": { "dir": [ @@ -2132,6 +2229,7 @@ "pl": "Język kreolski seszelski", "pt": "Crioulo de Seychelles", "ru": "сейшельский креольский язык", + "sv": "seychellisk kreol", "_meta": { "dir": [ "left-to-right" @@ -2193,7 +2291,7 @@ "pt": "cassúbio", "pt_BR": "Língua cassúbia", "ru": "кашубский язык", - "sl": "Kašubščina", + "sl": "kašubščina", "sv": "kasjubiska", "_meta": { "dir": [ @@ -2202,6 +2300,7 @@ } }, "ctg": { + "ca": "chittagonià", "de": "Chittagonisch", "en": "Chittagonian", "es": "Idioma chittagoniano", @@ -2224,6 +2323,7 @@ "cv": { "ca": "txuvaix", "cs": "čuvaština", + "da": "tjuvasjisk", "de": "Tschuwaschisch", "en": "Chuvash", "eo": "ĉuvaŝa lingvo", @@ -2241,6 +2341,7 @@ "pt": "tchuvache", "pt_BR": "Língua tchuvache", "ru": "чувашский язык", + "sl": "čuvaščina", "sv": "tjuvasjiska", "zh_Hans": "楚瓦什语", "zh_Hant": "楚瓦什語", @@ -2271,7 +2372,7 @@ "pt": "galês", "pt_BR": "galês", "ru": "валлийский язык", - "sl": "Valižanščina", + "sl": "velščina", "sv": "kymriska", "zh_Hans": "威尔士语", "zh_Hant": "威爾士語", @@ -2302,7 +2403,7 @@ "pt": "dinamarquês", "pt_BR": "dinamarquês", "ru": "датский язык", - "sl": "Danščina", + "sl": "danščina", "sv": "danska", "zh_Hans": "丹麦语", "zh_Hant": "丹麥語", @@ -2353,7 +2454,7 @@ "fr": "allemand", "gl": "lingua alemá", "hu": "német", - "id": "Jerman", + "id": "bahasa Jerman", "it": "tedesco", "ja": "ドイツ語", "nb_NO": "tysk", @@ -2383,6 +2484,7 @@ "din": { "ca": "dinka", "cs": "Dinka", + "da": "Dinka", "de": "Dinka", "en": "Dinka", "es": "idioma dinka", @@ -2447,6 +2549,7 @@ "nl": "Rukai", "pl": "Rukai", "pt": "Língua rukai", + "sv": "rukai", "zh_Hans": "鲁凯语", "zh_Hant": "魯凱語", "_meta": { @@ -2491,6 +2594,7 @@ "pl": "język dusun", "pt": "Língua dusun", "ru": "дусунский язык", + "sv": "kadazandusun", "_meta": { "dir": [ "left-to-right" @@ -2532,6 +2636,7 @@ "pt": "Língua duala", "pt_BR": "Língua duala", "ru": "Дуала", + "sv": "douala", "zh_Hans": "杜阿拉语", "zh_Hant": "杜阿拉語", "_meta": { @@ -2547,7 +2652,7 @@ "de": "Dhivehi", "en": "Maldivian", "eo": "maldiva lingvo", - "es": "dhivehi", + "es": "maldivo", "fi": "Divehin kieli", "fr": "maldivien", "gl": "lingua maldivana", @@ -2562,6 +2667,8 @@ "pt_BR": "Língua divehi", "ru": "мальдивский язык", "sv": "divehi", + "zh_Hans": "迪维希语", + "zh_Hant": "迪維希語", "_meta": { "countries": [ "MV" @@ -2646,6 +2753,7 @@ "nb_NO": "Efik", "nl": "Efik", "pt": "Língua efik", + "sv": "efik", "zh_Hant": "艾菲克語", "_meta": { "dir": [ @@ -2657,7 +2765,7 @@ "ca": "emilià", "de": "Emilianisch", "en": "Emilian", - "eo": "Emiliaj lingvoj", + "eo": "emiliaj lingvoj", "es": "emiliano", "fi": "Emilian kieli", "fr": "émilien", @@ -2666,7 +2774,7 @@ "it": "emiliano", "ja": "エミリア語", "nl": "Emiliaans", - "pt": "Dialeto emiliano", + "pt": "dialeto emiliano", "ru": "эмилианский", "sv": "emilianska", "zh_Hant": "艾米利亞語", @@ -2677,28 +2785,28 @@ } }, "el": { - "ca": "grec modern", - "cs": "novořečtina", - "da": "nygræsk", - "de": "Neugriechisch", - "en": "Modern Greek", - "eo": "moderna greka lingvo", - "es": "griego moderno", - "fi": "nykykreikka", - "fr": "grec moderne", - "gl": "lingua grega moderna", - "hu": "újgörög", - "id": "Yunani Modern", - "it": "greco moderno", - "ja": "現代ギリシア語", + "ca": "grec", + "cs": "řečtina", + "da": "græsk", + "de": "Griechisch", + "en": "Greek", + "eo": "greka lingvo", + "es": "griego", + "fi": "kreikka", + "fr": "grec", + "gl": "lingua grega", + "hu": "görög", + "id": "Yunani", + "it": "greco", + "ja": "ギリシア語", "nb_NO": "nygresk", - "nl": "Nieuwgrieks", + "nl": "Grieks", "pl": "język nowogrecki", - "pt": "grego moderno", + "pt": "grego", "pt_BR": "língua grega", - "ru": "новогреческий язык", + "ru": "греческий язык", "sl": "grščina", - "sv": "nygrekiska", + "sv": "grekiska", "zh_Hans": "希腊语", "zh_Hant": "希臘語", "_meta": { @@ -2847,7 +2955,7 @@ "fr": "espagnol", "gl": "lingua castelá", "hu": "spanyol", - "id": "Spanyol", + "id": "bahasa Spanyol", "it": "spagnolo", "ja": "スペイン語", "nb_NO": "spansk", @@ -2902,7 +3010,7 @@ "nl": "Joepik", "pl": "Język yupik środkowy", "ru": "Центрально-юпикский язык", - "sv": "Centraljupik", + "sv": "centraljupik", "zh_Hans": "中阿拉斯加尤皮克语", "_meta": { "dir": [ @@ -2982,7 +3090,7 @@ "es": "extremeño", "fi": "extremadura", "fr": "estrémègne", - "gl": "Lingua estremeña", + "gl": "lingua estremeña", "id": "Bahasa Estremeñu", "it": "estremegno", "ja": "エストレマドゥーラ語", @@ -3010,7 +3118,7 @@ "fr": "persan", "gl": "lingua persa", "hu": "perzsa", - "id": "Persia", + "id": "bahasa Persia", "it": "persiano", "ja": "ペルシア語", "nb_NO": "persisk", @@ -3019,7 +3127,7 @@ "pt": "persa", "pt_BR": "persa", "ru": "персидский язык", - "sl": "Perzijščina", + "sl": "perzijščina", "sv": "persiska", "zh_Hant": "波斯語", "_meta": { @@ -3081,7 +3189,10 @@ "pl": "Język ful", "pt": "Língua fula", "ru": "фула", + "sl": "fulščina", "sv": "fula", + "zh_Hans": "富拉语", + "zh_Hant": "富拉語", "_meta": { "dir": [ "left-to-right", @@ -3144,6 +3255,7 @@ "pt": "Língua filipina", "pt_BR": "Língua filipina", "ru": "филиппинский язык", + "sl": "filipinščina", "sv": "Filipino", "zh_Hant": "菲律賓語", "_meta": { @@ -3212,6 +3324,7 @@ "fj": { "ca": "fijià", "cs": "fidžijština", + "da": "fijiansk", "de": "Fidschi", "en": "Fijian", "eo": "fiĝia lingvo", @@ -3288,7 +3401,7 @@ "pl": "język farerski", "pt": "Língua feroesa", "ru": "фарерский язык", - "sl": "Ferščina", + "sl": "ferščina", "sv": "färöiska", "zh_Hans": "法罗语", "_meta": { @@ -3399,7 +3512,7 @@ "nl": "Cajun-Frans", "pt": "francês cajun", "ru": "Кажунский диалект французского языка", - "sv": "Louisianafranska", + "sv": "louisianafranska", "_meta": { "dir": [ "left-to-right" @@ -3410,7 +3523,7 @@ "ca": "francoprovençal", "cs": "franko-provensálština", "de": "Frankoprovenzalisch", - "en": "Arpitan", + "en": "Franco-Provençal", "eo": "arpitana lingvo", "es": "franco-provenzal", "fi": "Arpitaani", @@ -3452,6 +3565,7 @@ "pl": "język północnofryzyjski", "pt": "frisão setentrional", "ru": "севернофризский язык", + "sl": "severna frizijščina", "sv": "nordfrisiska", "zh_Hans": "北弗里斯兰语", "zh_Hant": "北菲士蘭語", @@ -3481,7 +3595,7 @@ "pl": "język friulski", "pt": "friulano", "ru": "фриульский язык", - "sl": "Furlanščina", + "sl": "furlanščina", "sv": "friuliska", "_meta": { "dir": [ @@ -3540,7 +3654,7 @@ "pt": "irlandês", "pt_BR": "língua irlandesa", "ru": "ирландский язык", - "sl": "Irska gelščina", + "sl": "irščina", "sv": "iriska", "zh_Hans": "爱尔兰语", "zh_Hant": "愛爾蘭語", @@ -3567,7 +3681,7 @@ "nl": "Ga", "pl": "Język ga", "ru": "Га", - "sv": "ga (språk)", + "sv": "ga", "zh_Hant": "加語", "_meta": { "dir": [ @@ -3581,7 +3695,7 @@ "de": "Gagausisch", "en": "Gagauz", "eo": "gagauza lingvo", - "es": "gagauzo", + "es": "gagaúzo", "fi": "gagauzi", "fr": "gagaouze", "gl": "Lingua gagauza", @@ -3644,6 +3758,7 @@ "pl": "język kreolski Gujany Francuskiej", "pt": "Crioulo da Guiana Francesa", "ru": "Гвианский креольский язык", + "sl": "gvajanska kreolščina", "sv": "guyanansk kreol", "zh_Hant": "圭亞那克里奧爾法語", "_meta": { @@ -3673,7 +3788,7 @@ "pt": "Língua gaélica escocesa", "pt_BR": "Língua gaélica escocesa", "ru": "шотландский гэльский язык", - "sl": "Škotska gelščina", + "sl": "škotska gelščina", "sv": "skotsk gaeliska", "_meta": { "dir": [ @@ -3684,7 +3799,7 @@ "gil": { "ca": "gilbertès", "cs": "kiribatština", - "da": "Kiribatisk", + "da": "gilbertesisk", "de": "Kiribatisch", "en": "Gilbertese", "eo": "kiribata lingvo", @@ -3729,7 +3844,7 @@ "pt": "galego", "pt_BR": "língua galega", "ru": "галисийский язык", - "sl": "Galicijščina", + "sl": "galicijščina", "sv": "galiciska", "zh_Hant": "加利西亞語", "_meta": { @@ -3802,6 +3917,7 @@ "fr": "konkani de Goa", "ja": "ゴア・コンカニ語", "nl": "Goa-Konkani", + "sv": "goakonkani", "_meta": { "dir": [ "left-to-right" @@ -3842,7 +3958,9 @@ "en": "Ghanaian Pidgin English", "eo": "ganaa piĝino", "es": "pidgin inglés de Ghana", + "gl": "Pidgin ghanés", "ru": "ганский пиджин английского", + "sv": "ghanansk pidginengelska", "_meta": { "dir": [ "left-to-right" @@ -3857,7 +3975,7 @@ "eo": "germana signolingvo", "es": "lengua de señas alemana", "fi": "saksalainen viittomakieli", - "fr": "langue des signes allemande", + "fr": "Langue des signes allemande - DGS", "hu": "német jelnyelv", "id": "Bahasa Isyarat Jerman", "it": "lingua dei segni tedesca", @@ -3947,6 +4065,7 @@ "pl": "Język wayuu", "pt": "Língua wayuu", "ru": "Гуахиро", + "sv": "wayuunaiki", "_meta": { "dir": [ "left-to-right" @@ -3963,6 +4082,7 @@ "ja": "グン語", "nb_NO": "gun", "ru": "гун", + "sv": "gun", "_meta": { "dir": [ "left-to-right" @@ -4044,7 +4164,7 @@ "pl": "Język haida", "pt": "Língua haida", "ru": "Хайда", - "sv": "Haida (språk)", + "sv": "haida", "zh_Hans": "海达语", "zh_Hant": "海達語", "_meta": { @@ -4072,6 +4192,7 @@ "pl": "język hakka", "pt": "Língua hakka", "ru": "хакка", + "sl": "hakka", "sv": "hakka", "zh_Hans": "客家语", "zh_Hant": "客家話", @@ -4145,40 +4266,6 @@ ] } }, - "hi": { - "ca": "hindi", - "cs": "hindština", - "da": "hindi", - "de": "Hindi", - "en": "Hindi", - "eo": "hindia lingvo", - "es": "hindi", - "fi": "hindi", - "fr": "hindi", - "gl": "lingua hindi", - "hu": "hindi", - "id": "Bahasa Hindi", - "it": "hindi", - "ja": "ヒンディー語", - "nb_NO": "hindi", - "nl": "Hindi", - "pl": "język hindi", - "pt": "língua hindi", - "pt_BR": "língua hindi", - "ru": "хинди", - "sl": "hindijščina", - "sv": "hindi", - "zh_Hans": "印地语", - "zh_Hant": "印地語", - "_meta": { - "countries": [ - "IN" - ], - "dir": [ - "left-to-right" - ] - } - }, "hif": { "ca": "hindi de Fiji", "cs": "fidžijská hindština", @@ -4240,6 +4327,7 @@ "it": "Hindko", "ja": "ヒンドコ語", "nb_NO": "hindko", + "pt": "Língua hindko", "ru": "хиндко", "sv": "hindko", "zh_Hans": "印德科语", @@ -4270,6 +4358,7 @@ "pl": "Hiri motu", "pt": "Língua hiri motu", "ru": "хири-моту", + "sl": "hiri motu", "sv": "hiri motu", "_meta": { "countries": [ @@ -4314,7 +4403,7 @@ "pt": "hunsriqueano riograndense", "pt_BR": "hunsriqueano riograndense", "ru": "Хунсрик", - "sv": "Riograndenser Hunsrückisch", + "sv": "hunsrik", "_meta": { "dir": [ "left-to-right" @@ -4371,6 +4460,7 @@ "pt": "crioulo haitiano", "pt_BR": "Língua crioula haitiana", "ru": "гаитянский креольский язык", + "sl": "haitijska kreolščina", "sv": "haitisk kreol", "zh_Hans": "海地克里奥尔语", "zh_Hant": "海地克里奧爾語", @@ -4466,6 +4556,7 @@ "nl": "West-Armeens", "pl": "język zachodnioormiański", "ru": "западноармянский язык", + "sl": "zahodna armenščina", "sv": "västarmeniska", "zh_Hans": "西部亚美尼亚语", "zh_Hant": "西部亞美尼亞語", @@ -4514,7 +4605,7 @@ "fr": "indonésien", "gl": "lingua indonesia", "hu": "indonéz", - "id": "bahasa Indonesia", + "id": "Bahasa Indonesia", "it": "indonesiano", "ja": "インドネシア語", "nb_NO": "indonesisk", @@ -4579,7 +4670,8 @@ "nl": "Yi", "pl": "język nuosu", "pt": "Língua Nuosu", - "ru": "Носу", + "ru": "носу", + "sv": "nuosu", "_meta": { "dir": [ "left-to-right" @@ -4614,7 +4706,7 @@ }, "ilo": { "ca": "ilocano", - "cs": "Ilokánština", + "cs": "ilokánština", "da": "ilokansk", "de": "Ilokano", "en": "Ilocano", @@ -4687,7 +4779,7 @@ "pt": "islandês", "pt_BR": "língua islandesa", "ru": "исландский язык", - "sl": "Islandščina", + "sl": "islandščina", "sv": "isländska", "zh_Hans": "冰岛语", "zh_Hant": "冰島語", @@ -4758,6 +4850,7 @@ "pt": "Língua inuktitut", "pt_BR": "Língua inuktitut", "ru": "инуктитут", + "sl": "inuktitutščina", "sv": "inuktitut", "zh_Hans": "伊努克提图特语", "zh_Hant": "伊努克提圖特語", @@ -4788,7 +4881,7 @@ "pt": "japonês", "pt_BR": "língua japonesa", "ru": "японский язык", - "sl": "Japonščina", + "sl": "japonščina", "sv": "japanska", "zh_Hans": "日语", "zh_Hant": "日語", @@ -4839,6 +4932,7 @@ "ja": "ジャンビ・マレー語", "pl": "Język jambi", "ru": "Джамби", + "sv": "jambimalajiska", "_meta": { "dir": [ "left-to-right" @@ -4848,12 +4942,12 @@ "jv": { "ca": "javanès", "cs": "javánština", - "da": "Javanesisk", + "da": "javanesisk", "de": "Javanisch", "en": "Javanese", "eo": "java lingvo", "es": "javanés", - "fi": "Jaavan kieli", + "fi": "jaavan kieli", "fr": "javanais", "gl": "Lingua xavanesa", "hu": "jávai", @@ -4866,6 +4960,7 @@ "pt": "Língua javanesa", "pt_BR": "Língua javanesa", "ru": "яванский язык", + "sl": "javanščina", "sv": "javanesiska", "zh_Hans": "爪哇语", "zh_Hant": "爪哇語", @@ -4900,7 +4995,7 @@ "pt": "língua georgiana", "pt_BR": "língua georgiana", "ru": "грузинский язык", - "sl": "Gruzinščina", + "sl": "gruzinščina", "sv": "georgiska", "zh_Hans": "格鲁吉亚语", "zh_Hant": "喬治亞語", @@ -4931,6 +5026,7 @@ "pl": "Język karakałpacki", "pt": "Língua caracalpaque", "ru": "каракалпакский язык", + "sl": "karakalpakščina", "sv": "karakalpakiska", "zh_Hant": "卡拉卡爾帕克語", "_meta": { @@ -5007,9 +5103,10 @@ "id": "Bahasa Kabiye", "ja": "カビエ語", "nl": "Kabiye", - "pl": "Kabiyé", + "pl": "język kabre", "pt": "Língua kabiyé", "ru": "Кабийе", + "sv": "kabiye", "_meta": { "dir": [ "left-to-right" @@ -5022,10 +5119,11 @@ "en": "Tyap", "es": "Katab", "fi": "Tyap", - "fr": "katab", + "fr": "tyap", "gl": "Lingua tyap", "ja": "カタブ語", "nl": "Tyap", + "sv": "katab", "_meta": { "dir": [ "left-to-right" @@ -5098,6 +5196,7 @@ "pl": "Język khasi", "pt": "Língua khasi", "ru": "Кхаси", + "sv": "khasi", "zh_Hans": "卡西语", "zh_Hant": "卡西語", "_meta": { @@ -5114,6 +5213,7 @@ "pl": "Język kham", "pt": "Tibetano khams", "ru": "камский тибетский язык", + "sv": "khamtibetanska", "_meta": { "dir": [ "left-to-right" @@ -5159,7 +5259,7 @@ "pl": "język kikuju", "pt": "Língua kikuyu", "pt_BR": "Língua kikuyu", - "ru": "Кикуйю", + "ru": "кикуйю", "sv": "kikuyu", "zh_Hans": "基库尤语", "zh_Hant": "基庫尤語", @@ -5203,7 +5303,7 @@ "pl": "Język khmu", "pt": "Língua Khmu", "ru": "Кхму (язык)", - "sv": "Kammu", + "sv": "kammu", "_meta": { "dir": [ "left-to-right" @@ -5218,6 +5318,7 @@ "nl": "oostelijk Pwo", "pt": "Língua pwo leste", "ru": "Восточный пво", + "sv": "östlig pwo", "_meta": { "dir": [ "left-to-right" @@ -5236,7 +5337,7 @@ "fr": "kazakh", "gl": "Lingua casaca", "hu": "kazak", - "id": "bahasa Kazak", + "id": "bahasa Kazakh", "it": "kazako", "ja": "カザフ語", "nb_NO": "kasakhisk", @@ -5310,6 +5411,7 @@ "pt": "Língua khmer", "pt_BR": "Língua khmer", "ru": "кхмерский язык", + "sl": "kmerščina", "sv": "khmer", "zh_Hant": "高棉語", "_meta": { @@ -5372,7 +5474,7 @@ "pt": "coreano", "pt_BR": "coreano", "ru": "корейский язык", - "sl": "Korejščina", + "sl": "korejščina", "sv": "koreanska", "zh_Hans": "朝鲜语", "zh_Hant": "韓語", @@ -5469,7 +5571,7 @@ } }, "kri": { - "ca": "Crioll serralleonès", + "ca": "crioll de Sierra Leone", "cs": "Krio", "de": "Krio", "en": "Krio", @@ -5477,6 +5579,7 @@ "es": "Criollo sierraleonés", "fi": "Krion kieli", "fr": "krio", + "gl": "Lingua krio", "id": "Bahasa Krio", "it": "lingua krio", "ja": "クリオ語", @@ -5508,6 +5611,7 @@ "pl": "język Karaya", "pt": "língua Karai-a", "ru": "Карайский язык", + "sv": "harajanska", "_meta": { "dir": [ "left-to-right" @@ -5591,6 +5695,7 @@ "pl": "gwary rypuaryjskie", "pt": "Língua ripuária", "ru": "рипуарские диалекты", + "sv": "ripuariska", "_meta": { "dir": [ "left-to-right" @@ -5618,7 +5723,7 @@ "pt": "língua curda", "pt_BR": "língua curda", "ru": "курдские языки", - "sl": "Kurdski jeziki", + "sl": "kurdščina", "sv": "kurdiska", "zh_Hans": "库尔德语", "zh_Hant": "庫德語", @@ -5646,6 +5751,7 @@ "ja": "クムク語", "nb_NO": "kumykisk", "nl": "Koemuks", + "pl": "język kumycki", "pt": "Língua kumyk", "pt_BR": "Língua kumyk", "ru": "кумыкский язык", @@ -5670,6 +5776,7 @@ "pl": "Język kutenai", "pt": "Língua kutenai", "ru": "Кутенай", + "sv": "kootenai", "zh_Hans": "库特奈语", "zh_Hant": "庫特奈語", "_meta": { @@ -5726,7 +5833,7 @@ "pt": "Kerinci", "pt_BR": "Kerinci", "sl": "Kerinci", - "sv": "Kerinci", + "sv": "kerinci", "_meta": { "dir": [ "left-to-right" @@ -5753,7 +5860,7 @@ "pl": "język kornijski", "pt": "córnico", "ru": "корнский язык", - "sl": "Kornijščina", + "sl": "kornijščina", "sv": "korniska", "zh_Hans": "康沃尔语", "zh_Hant": "康瓦爾語", @@ -5806,7 +5913,7 @@ "en": "Judaeo-Spanish", "eo": "judhispana lingvo", "es": "judeoespañol", - "fi": "Ladinon kieli", + "fi": "ladino", "fr": "judéo-espagnol", "gl": "Lingua xudeu-española", "hu": "ladino", @@ -5819,6 +5926,7 @@ "pt": "judeu-espanhol", "pt_BR": "Judeu-espanhol", "ru": "сефардский язык", + "sl": "sefardščina", "sv": "ladino", "_meta": { "dir": [ @@ -5837,6 +5945,7 @@ "nb_NO": "Rangi", "nl": "Langi", "pl": "Język langi", + "sv": "rangi", "_meta": { "dir": [ "left-to-right" @@ -5864,8 +5973,9 @@ "pt": "língua luxemburguesa", "pt_BR": "língua luxemburguesa", "ru": "люксембургский язык", - "sl": "Luksemburščina", + "sl": "luksemburščina", "sv": "luxemburgiska", + "zh_Hant": "盧森堡語", "_meta": { "countries": [ "LU" @@ -5981,7 +6091,7 @@ "pl": "język liguryjski", "pt": "Língua lígure", "ru": "лигурский язык", - "sl": "Ligurščina", + "sl": "ligurščina", "sv": "liguriska", "_meta": { "dir": [ @@ -6086,7 +6196,7 @@ "nb_NO": "lombardisk", "nl": "Lombardisch", "pl": "Język lombardzki", - "pt": "Língua lombarda", + "pt": "língua lombarda", "ru": "ломбардский язык", "sv": "lombardiska", "_meta": { @@ -6192,6 +6302,7 @@ "ja": "北ロル語", "nl": "Noordelijk Luri", "pt": "luri setentrional", + "sv": "nordluriska", "_meta": { "dir": [ "right-to-left" @@ -6219,7 +6330,7 @@ "pt": "língua lituana", "pt_BR": "língua lituana", "ru": "литовский язык", - "sl": "Litovščina", + "sl": "litovščina", "sv": "litauiska", "zh_Hans": "立陶宛语", "zh_Hant": "立陶宛語", @@ -6286,6 +6397,7 @@ "fr": "luri du Sud", "ja": "南ロル語", "ru": "южнолурский язык", + "sv": "sydluriska", "_meta": { "dir": [ "right-to-left" @@ -6313,7 +6425,7 @@ "pt": "língua letã", "pt_BR": "língua letã", "ru": "латышский язык", - "sl": "Latvijščina", + "sl": "latvijščina", "sv": "lettiska", "zh_Hant": "拉脫維亞語", "_meta": { @@ -6336,7 +6448,7 @@ "pl": "język lavukaleve", "pt": "lavukaleve", "ru": "Лавукалеве", - "sv": "Lavukaleve", + "sv": "lavukaleve", "_meta": { "dir": [ "left-to-right" @@ -6361,7 +6473,7 @@ "nl": "Lazisch", "pl": "Język lazyjski", "pt": "laz", - "ru": "Лазский язык", + "ru": "лазский язык", "sv": "laziska", "zh_Hans": "拉兹語", "zh_Hant": "拉茲語", @@ -6388,6 +6500,7 @@ "pl": "język madurski", "pt": "Língua maduresa", "ru": "Мадурский язык", + "sl": "madureščina", "sv": "maduresiska", "_meta": { "dir": [ @@ -6465,6 +6578,7 @@ "pl": "język kreolski Mauritiusa", "pt": "crioulo de Maurício", "ru": "Маврикийский креольский язык", + "sv": "Mauritiuskreol", "_meta": { "dir": [ "left-to-right" @@ -6493,6 +6607,7 @@ "pt_BR": "Língua malgaxe", "ru": "малагасийский язык", "sv": "malagassiska", + "zh_Hans": "马达加斯加语", "zh_Hant": "馬達加斯加語", "_meta": { "countries": [ @@ -6506,6 +6621,7 @@ "mh": { "ca": "marshallès", "cs": "maršálština", + "da": "marshallesisk", "de": "Marshallesisch", "en": "Marshallese", "eo": "marŝala lingvo", @@ -6558,7 +6674,7 @@ "mi": { "ca": "maori", "cs": "maorština", - "da": "Maori", + "da": "maori", "de": "Māori", "en": "Māori", "eo": "maoria lingvo", @@ -6576,6 +6692,7 @@ "pt": "língua maori", "pt_BR": "língua maori", "ru": "маори", + "sl": "maorščina", "sv": "maori", "zh_Hans": "毛利语", "zh_Hant": "毛利語", @@ -6589,6 +6706,7 @@ } }, "mic": { + "ca": "micmac", "cs": "mikmačtina", "de": "Micmac-Sprache", "en": "Mi'kmaq", @@ -6603,6 +6721,7 @@ "nl": "Mi'kmaq", "pl": "Język mikmak", "ru": "микмак", + "sv": "micmac", "_meta": { "dir": [ "left-to-right" @@ -6619,7 +6738,7 @@ "fi": "Minangkabaun kieli", "fr": "minangkabau", "gl": "Lingua minangkabau", - "id": "Minangkabau", + "id": "Bahasa Minangkabau", "it": "minangkabau", "ja": "ミナンカバウ語", "nb_NO": "Minangkabau", @@ -6723,6 +6842,7 @@ "pt": "Língua mongol", "pt_BR": "Língua mongol", "ru": "монгольский язык", + "sl": "mongolščina", "sv": "mongoliska", "zh_Hans": "蒙古语", "zh_Hant": "蒙古語", @@ -6795,18 +6915,19 @@ "ca": "mon", "de": "Mon", "en": "Mon", - "eo": "Mon (lingvo)", - "es": "mon", + "eo": "Mon", + "es": "Mon", "fr": "môn", - "gl": "Lingua mon", + "gl": "lingua mon", "id": "Bahasa Mon", "it": "lingua mon", "ja": "モン語", "nb_NO": "mon", "nl": "Mon", - "pl": "Język mon", - "pt": "Língua mon", + "pl": "język mon", + "pt": "língua mon", "ru": "монский язык", + "sv": "mon", "zh_Hans": "孟语", "zh_Hant": "孟語", "_meta": { @@ -6835,7 +6956,7 @@ "pt": "Língua moldávia", "pt_BR": "língua moldávia", "ru": "молдавский язык", - "sl": "Moldavščina", + "sl": "moldavščina", "sv": "moldaviska", "zh_Hant": "摩爾多瓦語", "_meta": { @@ -6854,6 +6975,7 @@ "it": "innu-aimun", "nl": "Innu language", "ru": "Монтанье-наскапи", + "sv": "innu-aimun", "_meta": { "dir": [ "left-to-right" @@ -6881,6 +7003,7 @@ "pt": "marata", "pt_BR": "Língua marata", "ru": "маратхи", + "sl": "maratščina", "sv": "marathi", "zh_Hans": "马拉地语", "zh_Hant": "馬拉地語", @@ -6893,9 +7016,10 @@ "mrh": { "ca": "Lakher", "en": "Mara", - "fr": "mara", + "fr": "Mara", "ja": "マラ語", "ru": "Мара", + "sv": "mara", "_meta": { "dir": [ "left-to-right" @@ -6937,7 +7061,7 @@ "fr": "malais", "gl": "lingua malaia", "hu": "maláj", - "id": "bahasa Melayu", + "id": "Bahasa Melayu", "it": "malese", "ja": "マレー語", "nb_NO": "malayisk", @@ -6946,6 +7070,7 @@ "pt": "malaio", "pt_BR": "língua malaia", "ru": "малайский язык", + "sl": "malajščina", "sv": "malajiska", "zh_Hans": "马来语", "zh_Hant": "馬來語", @@ -6973,7 +7098,7 @@ "fr": "maltais", "gl": "Lingua maltesa", "hu": "máltai", - "id": "Bahasa Malta", + "id": "bahasa Malta", "it": "maltese", "ja": "マルタ語", "nb_NO": "maltesisk", @@ -6982,7 +7107,7 @@ "pt": "Maltês", "pt_BR": "língua maltesa", "ru": "мальтийский язык", - "sl": "Malteščina", + "sl": "malteščina", "sv": "maltesiska", "_meta": { "countries": [ @@ -7005,6 +7130,8 @@ "pl": "język musi", "pt": "Musi", "ru": "Муси", + "sl": "musijščina", + "sv": "musi", "_meta": { "dir": [ "left-to-right" @@ -7030,6 +7157,7 @@ "pt": "Língua creek", "pt_BR": "Língua creek", "ru": "Крикский язык", + "sv": "muskogi", "_meta": { "dir": [ "left-to-right" @@ -7112,6 +7240,7 @@ "pt": "birmanês", "pt_BR": "Língua birmanesa", "ru": "бирманский язык", + "sl": "burmanščina", "sv": "burmesiska", "_meta": { "countries": [ @@ -7193,7 +7322,7 @@ "ja": "ナウル語", "nb_NO": "naurisk", "nl": "Nauruaans", - "pl": "Język naurański", + "pl": "język naurański", "pt": "Língua nauruana", "pt_BR": "Língua nauruana", "ru": "науруанский язык", @@ -7219,7 +7348,7 @@ "fr": "minnan", "gl": "lingua min nam", "hu": "minnan", - "id": "Min Selatan", + "id": "Bahasa Min Selatan", "it": "min nan", "ja": "閩南語", "nb_NO": "minnan", @@ -7228,7 +7357,9 @@ "pt": "Min Nan", "pt_BR": "Min nan", "ru": "южноминьский язык", + "sl": "južna minščina", "sv": "minnan", + "zh_Hans": "闽南语", "zh_Hant": "閩南語", "_meta": { "dir": [ @@ -7239,7 +7370,7 @@ "nap": { "ca": "napolità", "cs": "neapolština", - "da": "Napolitansk", + "da": "napolitansk", "de": "Neapolitanisch", "en": "Neapolitan", "eo": "napola lingvo", @@ -7256,6 +7387,7 @@ "pl": "język neapolitański", "pt": "napolitano", "ru": "неаполитанский язык", + "sl": "neapeljščina", "sv": "neapolitanska", "zh_Hans": "那不勒斯语", "zh_Hant": "那不勒斯語", @@ -7286,7 +7418,7 @@ "pt": "bokmål", "pt_BR": "Bokmål", "ru": "букмол", - "sl": "Bokmål", + "sl": "bokmål", "sv": "bokmål", "_meta": { "dir": [ @@ -7314,7 +7446,7 @@ "pl": "język dolnoniemiecki", "pt": "Baixo-alemão", "ru": "нижненемецкий язык", - "sl": "Nizka nemščina", + "sl": "nizka nemščina", "sv": "lågtyska", "zh_Hant": "低地德語", "_meta": { @@ -7411,13 +7543,14 @@ "fi": "Niasin kieli", "fr": "niha", "gl": "Lingua nias", - "id": "Nias", + "id": "Bahasa Nias", "it": "lingua nias", "ja": "ニアス語", "nl": "Nias", "pl": "Język nias", "pt": "Língua nias", "ru": "Ниасский язык", + "sv": "nias", "zh_Hans": "尼亚斯语", "zh_Hant": "尼亞斯語", "_meta": { @@ -7463,7 +7596,7 @@ "fr": "néerlandais", "gl": "lingua neerlandesa", "hu": "holland", - "id": "bahasa Belanda", + "id": "Belanda", "it": "olandese", "ja": "オランダ語", "nb_NO": "nederlandsk", @@ -7508,6 +7641,7 @@ "pt": "novo norueguês", "pt_BR": "novo norueguês", "ru": "нюнорск", + "sl": "nynorsk", "sv": "nynorska", "zh_Hant": "新挪威語", "_meta": { @@ -7540,7 +7674,7 @@ "pt": "língua norueguesa", "pt_BR": "língua norueguesa", "ru": "норвежский язык", - "sl": "Norveščina", + "sl": "norveščina", "sv": "norska", "zh_Hans": "挪威语", "zh_Hant": "挪威語", @@ -7567,6 +7701,7 @@ "pl": "Język północnotajski", "pt": "Língua tai norte", "ru": "Юан (язык)", + "sv": "nordthai", "zh_Hans": "北部泰语", "zh_Hant": "北部泰語", "_meta": { @@ -7607,7 +7742,7 @@ "nl": "N’Ko", "pl": "Język n’ko", "ru": "Нко", - "sv": "N'ko", + "sv": "n'ko", "zh_Hans": "康柏语", "zh_Hant": "康柏語", "_meta": { @@ -7626,6 +7761,7 @@ "fr": "nrebele", "gl": "Lingua ndebele", "hu": "déli ndebele", + "id": "Bahasa Ndebele Selatan", "it": "ndebele del sud", "ja": "南ンデベレ語", "nb_NO": "sørndebele", @@ -7664,7 +7800,8 @@ "pt": "Guernésiais", "ru": "Гернсийский диалект нормандского языка", "sl": "Guernseyščina", - "sv": "Guernésiais", + "sv": "guernésiais", + "zh_Hans": "根西方言", "_meta": { "dir": [ "left-to-right" @@ -7691,6 +7828,7 @@ "pt": "língua soto do norte", "pt_BR": "língua soto do norte", "ru": "северный сото", + "sl": "severna sotojščina", "sv": "nordsotho", "zh_Hant": "北索托語", "_meta": { @@ -7762,6 +7900,7 @@ "de": "Noongar", "en": "Noongar", "fr": "nyungan", + "gl": "Lngua noongar", "ja": "ニュンガル語", "nl": "Nyunga", "sv": "nyunga", @@ -7792,7 +7931,7 @@ "pt": "língua occitana", "pt_BR": "Língua occitana", "ru": "окситанский язык", - "sl": "Okcitanščina", + "sl": "okcitanščina", "sv": "occitanska", "_meta": { "dir": [ @@ -7829,7 +7968,7 @@ } }, "olo": { - "ca": "livvi-carelià", + "ca": "livià", "de": "Olonetzisch", "en": "Livvi-Karelian", "eo": "olonec-karela lingvo", @@ -7888,6 +8027,7 @@ "nb_NO": "O'odham", "nl": "O'odham", "pl": "Język o'odham", + "pt": "Língua o'odham", "ru": "оодхам", "sv": "o'odham", "_meta": { @@ -7898,8 +8038,8 @@ }, "or": { "ca": "oriya", - "cs": "orijština", - "da": "oriya", + "cs": "urijština", + "da": "odia", "de": "Oriya", "en": "Odia", "eo": "odia lingvo", @@ -7916,6 +8056,7 @@ "pl": "język orija", "pt": "língua oriá", "ru": "ория", + "sl": "odijščina", "sv": "oriya", "zh_Hans": "奥里亚语", "zh_Hant": "奧里亞語", @@ -7966,6 +8107,7 @@ "nb_NO": "Osage", "nl": "Osage", "ru": "Оседжи", + "sv": "osage", "_meta": { "dir": [ "left-to-right" @@ -7999,24 +8141,25 @@ }, "pa_PK": { "ca": "panjabi (Shahmukhi)", - "cs": "paňdžábština (Shahmukhi)", + "cs": "paňdžábština (šáhmukhí)", "da": "Punjabi (Shahmukhi)", "de": "Panjabi (Shahmukhi)", "en": "Punjabi (Shahmukhi)", "eo": "panĝaba lingvo (Ŝahmuĥi-ortografio)", - "es": "panyabí (alfabeto shahmuji)", + "es": "panyabí (Shahmuji)", "fi": "punjabin kieli (Shahmukhi)", - "fr": "pendjabi (Shahmukhi)", + "fr": "pendjabi (shahmukhi)", "gl": "lingua punjabi (Shahmukhi)", "hu": "pandzsábi (Shahmukhi)", - "id": "Bahasa Punjab (Shahmukhi)", + "id": "Bahasa Punjab (Abjad Shahmukhi)", "it": "punjabi (Shahmukhī)", "ja": "パンジャーブ語 (シャームキー文字)", "nb_NO": "panjabi (Shahmukhi)", - "nl": "Punjabi (Shahmukhī alphabet)", + "nl": "Punjabi (Shahmukhi)", "pl": "język pendżabski (szachmukhi)", "pt": "Língua panjabi (Shahmukhi)", "ru": "панджаби (Шахмукхи)", + "sl": "pandžabščina (šahmuki)", "sv": "punjabi (Shahmukhi)", "zh_Hans": "旁遮普语 (Shahmukhi)", "zh_Hant": "旁遮普語 (Shahmukhi)", @@ -8104,6 +8247,7 @@ "pl": "język pikardyjski", "pt": "picardo", "ru": "пикардский язык", + "sl": "pikardščina", "sv": "pikardiska", "_meta": { "dir": [ @@ -8131,7 +8275,7 @@ "pt": "Alemão da Pensilvânia", "ru": "пенсильванско-немецкий диалект", "sl": "Pensilvanska nemščina", - "sv": "Pennsylvaniatyska", + "sv": "pennsylvaniatyska", "_meta": { "dir": [ "left-to-right" @@ -8211,6 +8355,25 @@ ] } }, + "pis": { + "de": "Pijin", + "en": "Pijin", + "eo": "piĵina lingvo", + "es": "Pidgin salomonense", + "fi": "Pijin", + "fr": "pijin", + "it": "lingua pijin", + "ja": "ピジン語", + "pl": "Język neosalomoński", + "pt": "Língua pijin", + "ru": "Пиджин Соломоновых Островов", + "sv": "pijin", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "pjt": { "de": "Pitjantjatjara Sprache", "en": "Pitjantjatjara", @@ -8292,23 +8455,6 @@ ] } }, - "pnb": { - "de": "Westliches Panjabi", - "en": "Western Punjabi", - "eo": "okcidenta panĝaba lingvo", - "fr": "pendjabi de l'Ouest", - "it": "lingua punjabi occidentale", - "ja": "西パンジャーブ語", - "nl": "West-Punjabi", - "pl": "Język zachodniopendżabski", - "ru": "западный панджаби", - "sv": "västpunjabi", - "_meta": { - "dir": [ - "right-to-left" - ] - } - }, "pnt": { "ca": "pòntic", "cs": "Pontština", @@ -8408,7 +8554,7 @@ "fr": "portugais", "gl": "lingua portuguesa", "hu": "portugál", - "id": "Portugis", + "id": "bahasa Portugis", "it": "portoghese", "ja": "ポルトガル語", "nb_NO": "portugisisk", @@ -8459,6 +8605,7 @@ "pt": "português brasileiro", "pt_BR": "português brasileiro", "ru": "бразильский вариант португальского языка", + "sl": "brazilska portugalščina", "sv": "brasiliansk portugisiska", "zh_Hans": "巴西葡萄牙语", "zh_Hant": "巴西葡萄牙語", @@ -8528,6 +8675,7 @@ }, "rar": { "ca": "maori de les Illes Cook", + "da": "rarotongansk", "de": "Rarotonganisch", "en": "Cook Islands Maori", "eo": "Kuk-insulara maoria lingvo", @@ -8558,12 +8706,14 @@ "es": "romañol", "fi": "romagnolin kieli", "fr": "romagnol", + "hu": "romagnai nyelv", "id": "bahasa Romagnol", "it": "romagnolo", "ja": "ロマーニャ語", "nl": "Romagnools", "pt": "romagnol", "ru": "Романьольский язык", + "sv": "romagnol", "zh_Hans": "罗马涅语", "zh_Hant": "羅馬涅語", "_meta": { @@ -8586,18 +8736,21 @@ "pl": "Język tarifit", "pt": "Língua rifenha", "ru": "Рифский язык", + "sv": "rif", "zh_Hans": "里夫语", "zh_Hant": "里夫語", "_meta": { "dir": [ "right-to-left", - "left-to-right" + "left-to-right", + "top-to-bottom", + "bottom-to-top" ] } }, "rki": { "ca": "arakanès", - "en": "Arakanese", + "en": "Rakhine", "fr": "arakanais", "gl": "Lingua arakanesa", "id": "Bahasa Arakan", @@ -8605,6 +8758,7 @@ "pl": "Język arakański", "pt": "Língua arracanesa", "ru": "Араканский язык", + "sv": "arakanesiska", "zh_Hans": "若开语", "zh_Hant": "若開語", "_meta": { @@ -8634,7 +8788,7 @@ "pt": "romanche", "pt_BR": "língua romanche", "ru": "романшский язык", - "sl": "Retoromanščina", + "sl": "retoromanščina", "sv": "rätoromanska", "_meta": { "countries": [ @@ -8654,6 +8808,7 @@ "ja": "中央方言群", "nl": "Carpathian Romani", "ru": "Карпатские диалекты цыганского языка", + "sv": "centralromani", "_meta": { "dir": [ "left-to-right" @@ -8671,7 +8826,7 @@ "fi": "romanikieli", "fr": "romani", "gl": "lingua romaní", - "hu": "cigány", + "hu": "cigány nyelv", "id": "Bahasa Romani", "it": "romaní", "ja": "ロマ語", @@ -8730,7 +8885,7 @@ "fr": "roumain", "gl": "lingua romanesa", "hu": "román", - "id": "Bahasa Rumania", + "id": "bahasa Rumania", "it": "romeno", "ja": "ルーマニア語", "nb_NO": "rumensk", @@ -8739,7 +8894,7 @@ "pt": "língua romena", "pt_BR": "língua romena", "ru": "румынский язык", - "sl": "Romunščina", + "sl": "romunščina", "sv": "rumänska", "zh_Hant": "羅馬尼亞語", "_meta": { @@ -8764,7 +8919,7 @@ "fr": "russe", "gl": "lingua rusa", "hu": "orosz", - "id": "Rusia", + "id": "bahasa Rusia", "it": "russo", "ja": "ロシア語", "nb_NO": "russisk", @@ -8839,6 +8994,7 @@ "pl": "Język arumuński", "pt": "língua arromena", "ru": "арумынский язык", + "sl": "aromunščina", "sv": "arumänska", "_meta": { "dir": [ @@ -8847,7 +9003,7 @@ } }, "rw": { - "ca": "kinyarwanda", + "ca": "ruandès", "cs": "rwandština", "da": "Kinyarwanda", "de": "Kinyarwanda", @@ -8908,6 +9064,7 @@ "sah": { "ca": "iacut", "cs": "jakutština", + "da": "jakutisk", "de": "Jakutisch", "en": "Yakut", "eo": "jakuta lingvo", @@ -8951,6 +9108,7 @@ "pl": "język santali", "pt": "língua santali", "ru": "Сантали", + "sl": "santalščina", "sv": "santhali", "zh_Hant": "桑塔利語", "_meta": { @@ -9010,6 +9168,7 @@ "pt": "Língua siciliana", "pt_BR": "Língua siciliana", "ru": "сицилийский язык", + "sl": "sicilijanščina", "sv": "sicilianska", "_meta": { "dir": [ @@ -9063,6 +9222,7 @@ "pl": "Dialekt sassarski", "ru": "сассарский язык", "sl": "Sasarščina", + "sv": "sassaresiska", "zh_Hans": "萨萨里语", "zh_Hant": "薩薩里語", "_meta": { @@ -9116,6 +9276,7 @@ "pt": "língua sami setentrional", "pt_BR": "Língua lapônica setentrional", "ru": "северносаамский язык", + "sl": "severna samijščina", "sv": "nordsamiska", "zh_Hans": "北萨米语", "zh_Hant": "北薩米語", @@ -9155,6 +9316,7 @@ "fr": "koyraboro senni", "ja": "コイラボロ・センニ語", "nl": "Koyra Senni", + "sv": "koyraboro senni", "_meta": { "dir": [ "left-to-right" @@ -9217,6 +9379,8 @@ "_meta": { "dir": [ "left-to-right", + "top-to-bottom", + "bottom-to-top", "right-to-left" ] } @@ -9256,13 +9420,17 @@ "fr": "chaoui", "it": "tashawit", "ja": "シャウィーア語", + "nl": "Shawiya", "pl": "język chaouia", "pt": "Língua chaouis", "ru": "Шавия", + "sv": "shawiya", "_meta": { "dir": [ "right-to-left", - "left-to-right" + "left-to-right", + "top-to-bottom", + "bottom-to-top" ] } }, @@ -9287,7 +9455,7 @@ "pt": "Língua cingalesa", "pt_BR": "Língua cingalesa", "ru": "сингальский язык", - "sl": "Singalščina", + "sl": "sinhalščina", "sv": "singalesiska", "zh_Hant": "僧伽羅語", "_meta": { @@ -9313,6 +9481,7 @@ "nl": "Sidamo", "pl": "Język sidamo", "ru": "Сидамо", + "sv": "sidamo", "_meta": { "dir": [ "left-to-right" @@ -9337,7 +9506,10 @@ "pl": "Język kildin", "pt": "Língua sami de Kildin", "ru": "кильдинский саамский язык", + "sl": "kildinska samijščina", "sv": "kildinsamiska", + "zh_Hans": "基尔丁萨米语", + "zh_Hant": "基爾丁薩米語", "_meta": { "dir": [ "left-to-right" @@ -9414,7 +9586,7 @@ "pt": "eslovaco", "pt_BR": "língua eslovaca", "ru": "словацкий язык", - "sl": "Slovaščina", + "sl": "slovaščina", "sv": "slovakiska", "zh_Hant": "斯洛伐克語", "_meta": { @@ -9476,6 +9648,7 @@ "nl": "Silezisch Duits", "pl": "dialekt śląski języka niemieckiego", "ru": "силезские диалекты немецкого языка", + "sv": "schlesisk tyska", "zh_Hans": "西里西亚语", "zh_Hant": "西里西亞語", "_meta": { @@ -9487,6 +9660,7 @@ "sm": { "ca": "samoà", "cs": "samojština", + "da": "samoansk", "de": "Samoanisch", "en": "Samoan", "eo": "samoa lingvo", @@ -9516,7 +9690,7 @@ "sma": { "ca": "sami meridional", "cs": "jižní sámština", - "da": "Sydsamisk", + "da": "sydsamisk", "de": "Südsamisch", "en": "Southern Sami", "eo": "sud-samea lingvo", @@ -9589,6 +9763,7 @@ "pl": "Język inari", "pt": "lapônico de Inari", "ru": "инари-саамский язык", + "sl": "inarijska samijščina", "sv": "enaresamiska", "zh_Hans": "伊纳里萨米语", "zh_Hant": "伊納里薩米語", @@ -9598,6 +9773,35 @@ ] } }, + "sms": { + "ca": "sami skolt", + "cs": "skoltská sámština", + "de": "Skoltsamisch", + "en": "Skolt Sami", + "eo": "skolt-samea lingvo", + "es": "sami skolt", + "fi": "koltansaame", + "fr": "same skolt", + "gl": "Lingua saami de Skolt", + "hu": "kolta számi", + "it": "lingua sami skolt", + "ja": "スコルト・サーミ語", + "nb_NO": "skoltesamisk", + "nl": "Skolt-Samisch", + "pl": "język skolt", + "pt": "kíngua sami de Skolt", + "pt_BR": "Língua sami de Skolt", + "ru": "колтта-саамский язык", + "sl": "sokltska samijščina", + "sv": "skoltsamiska", + "zh_Hans": "斯科尔特萨米语", + "zh_Hant": "斯科爾特薩米語", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "sn": { "ca": "xona", "cs": "šonština", @@ -9671,6 +9875,7 @@ "nl": "Zuidelijk Thai", "pl": "Język południowotajski", "ru": "южнотайский диалект", + "sv": "sydthai", "zh_Hans": "南部泰语", "zh_Hant": "南部泰語", "_meta": { @@ -9754,6 +9959,7 @@ "nl": "Sirionó", "pt": "Língua sirionó", "ru": "сирионо", + "sv": "sirionó", "_meta": { "dir": [ "left-to-right" @@ -9843,7 +10049,7 @@ "pl": "Język shelta", "pt": "Língua shelta", "ru": "шелта", - "sv": "Shelta", + "sv": "shelta", "_meta": { "dir": [ "left-to-right" @@ -9890,7 +10096,7 @@ "fr": "soundanais", "gl": "Sunda", "hu": "szundai", - "id": "Bahasa Sunda", + "id": "Sunda", "it": "sunda", "ja": "スンダ語", "nb_NO": "sundanesisk", @@ -9990,8 +10196,9 @@ "ja": "シレット語", "nb_NO": "Sylhetti", "nl": "taal van Sylhet", + "pl": "język syloti", "ru": "силхетский язык", - "sv": "Syloti", + "sv": "syloti", "_meta": { "dir": [ "left-to-right" @@ -10018,7 +10225,7 @@ "pl": "etnolekt śląski", "pt": "silesiano", "ru": "силезский язык", - "sl": "Šlezijščina", + "sl": "šlezijščina", "sv": "schlesiska", "_meta": { "dir": [ @@ -10035,6 +10242,7 @@ "id": "Bahasa Sakizaya", "ja": "サキザヤ語", "pt": "Língua sakisaya", + "sv": "sakizaya", "zh_Hans": "撒奇莱雅语", "zh_Hant": "撒奇萊雅語", "_meta": { @@ -10064,7 +10272,7 @@ "pt": "Língua tâmil", "pt_BR": "língua tâmil", "ru": "тамильский язык", - "sl": "Tamilščina", + "sl": "tamilščina", "sv": "tamil", "zh_Hans": "泰米尔语", "zh_Hant": "坦米爾語", @@ -10095,6 +10303,7 @@ "nl": "Atayal", "pt": "Língua atayal", "ru": "атаяльский язык", + "sv": "atayal", "zh_Hans": "泰雅语", "zh_Hant": "泰雅語", "_meta": { @@ -10120,6 +10329,7 @@ "pl": "język tulu", "pt": "Língua túlu", "ru": "тулу", + "sl": "tulujščina", "sv": "tulu", "_meta": { "dir": [ @@ -10148,6 +10358,7 @@ "pt": "língua telugu", "pt_BR": "Língua telugu", "ru": "телугу", + "sl": "teluščina", "sv": "telugu", "zh_Hans": "泰卢固语", "zh_Hant": "泰盧固語", @@ -10205,7 +10416,7 @@ "pt": "Língua tadjique", "pt_BR": "Língua tadjique", "ru": "таджикский язык", - "sl": "Tadžiščina", + "sl": "tadžiščina", "sv": "tadzjikiska", "_meta": { "countries": [ @@ -10292,11 +10503,11 @@ "eo": "turkmena lingvo", "es": "turcomano", "fi": "turkmeeni", - "fr": "turkmène", + "fr": "Turkmène", "gl": "Lingua turcomá", "hu": "türkmén", "id": "Bahasa Turkmen", - "it": "turkmeno", + "it": "Turkmeno", "ja": "トルクメン語", "nb_NO": "turkmensk", "nl": "Turkmeens", @@ -10338,7 +10549,9 @@ "pt": "língua tagalo", "pt_BR": "língua tagalo", "ru": "тагальский язык", + "sl": "tagaloščina", "sv": "tagalog", + "zh_Hans": "他加禄语", "zh_Hant": "他加祿語", "_meta": { "dir": [ @@ -10431,6 +10644,7 @@ "to": { "ca": "tongalès", "cs": "tongánština", + "da": "tongansk", "de": "Tongaisch", "en": "Tongan", "eo": "Tonga lingvo", @@ -10447,6 +10661,7 @@ "pl": "Język tonga", "pt": "Língua tonganesa", "ru": "тонганский язык", + "sl": "tongovščina", "sv": "tonganska", "_meta": { "countries": [ @@ -10477,6 +10692,7 @@ "pl": "tok pisin", "pt": "Tok Pisin", "ru": "ток-писин", + "sl": "tok pisin", "sv": "tok pisin", "_meta": { "dir": [ @@ -10517,6 +10733,7 @@ "nb_NO": "Truku", "nl": "Taroko", "pt": "Língua seediq", + "sv": "seediq", "zh_Hans": "赛德克语", "zh_Hant": "賽德克語", "_meta": { @@ -10659,7 +10876,7 @@ "pt": "Língua twi", "pt_BR": "Língua twi", "ru": "чви", - "sv": "twi (språk)", + "sv": "twi", "_meta": { "dir": [ "left-to-right" @@ -10669,6 +10886,7 @@ "ty": { "ca": "tahitià", "cs": "Tahitština", + "da": "tahitiansk", "de": "Tahitianisch", "en": "Tahitian", "eo": "tahitia lingvo", @@ -10740,7 +10958,9 @@ "_meta": { "dir": [ "right-to-left", - "left-to-right" + "left-to-right", + "top-to-bottom", + "bottom-to-top" ] } }, @@ -10793,6 +11013,7 @@ "pt": "Língua uigur", "pt_BR": "Língua uigur", "ru": "уйгурский язык", + "sl": "ujgurščina", "sv": "uiguriska", "zh_Hans": "维吾尔语", "zh_Hant": "維吾爾語", @@ -10858,6 +11079,7 @@ "pt": "língua uzbeque", "pt_BR": "língua uzbeque", "ru": "узбекский язык", + "sl": "uzbeščina", "sv": "uzbekiska", "zh_Hans": "乌孜别克语", "zh_Hant": "烏孜別克語", @@ -10878,6 +11100,7 @@ "eo": "sud-uzbeka lingvo", "fr": "ouzbek du Sud", "ru": "Южноузбекский язык", + "sv": "syduzbekiska", "zh_Hans": "南乌兹别克语", "zh_Hant": "南烏茲別克語", "_meta": { @@ -10921,6 +11144,7 @@ "vec": { "ca": "vènet", "cs": "benátština", + "da": "venetiansk", "de": "Venetisch", "en": "Venetian", "eo": "venecia lingvo", @@ -10996,7 +11220,7 @@ "pt": "vietnamita", "pt_BR": "Língua vietnamita", "ru": "вьетнамский язык", - "sl": "Vietnamščina", + "sl": "vietnamščina", "sv": "vietnamesiska", "zh_Hant": "越南語", "_meta": { @@ -11044,6 +11268,7 @@ "ja": "マインフランク語", "nl": "Mainfrankisch", "ru": "Майнфранкские диалекты", + "sv": "Main-frankiska", "_meta": { "dir": [ "left-to-right" @@ -11125,6 +11350,7 @@ "pl": "język waloński", "pt": "valão", "ru": "валлонский язык", + "sl": "valonščina", "sv": "vallonska", "_meta": { "dir": [ @@ -11143,6 +11369,7 @@ "nl": "Wolayta", "pt": "Língua wolaytta", "ru": "Воламо", + "sv": "wolaytta", "_meta": { "dir": [ "left-to-right" @@ -11158,7 +11385,7 @@ "eo": "varaja lingvo", "es": "samareño", "fi": "waray-waray", - "fr": "waray-waray", + "fr": "ouarayen", "gl": "Lingua waray-waray", "hu": "waray", "id": "Bahasa Waray-waray", @@ -11195,6 +11422,7 @@ "pt": "Língua wakhi", "pt_BR": "Língua wakhi", "ru": "Ваханский язык", + "sv": "wakhí", "_meta": { "dir": [ "right-to-left", @@ -11222,7 +11450,7 @@ "pl": "języki łużyckie", "pt": "sorábio", "ru": "лужицкие языки", - "sl": "Lužiščina", + "sl": "lužiščina", "sv": "sorbiska", "_meta": { "dir": [ @@ -11243,7 +11471,7 @@ "pl": "Język uvea wschodni", "pt": "Língua wallisiana", "ru": "Уоллисский язык", - "sv": "Walliska", + "sv": "walliska", "_meta": { "dir": [ "left-to-right" @@ -11286,13 +11514,13 @@ "ca": "wu", "cs": "Wu", "de": "Wu", - "en": "Wu Chinese", + "en": "Wu Language", "eo": "vua lingvo", "es": "Chino wu", "fi": "Wu-kiina", "fr": "wu", "gl": "Lingua wu", - "id": "Bahasa Wu", + "id": "Rumpun bahasa Wu", "it": "wu", "ja": "呉語", "nb_NO": "wu", @@ -11300,6 +11528,7 @@ "pl": "język wu", "pt": "Língua wu", "ru": "у", + "sl": "vu", "sv": "wu", "zh_Hant": "吳語", "_meta": { @@ -11413,7 +11642,7 @@ "nl": "Yaghnobi", "pl": "Język jagnobijski", "pt": "Língua yaghnobi", - "ru": "Ягнобский язык", + "ru": "ягнобский язык", "sv": "yaghnobi", "_meta": { "dir": [ @@ -11433,6 +11662,7 @@ "pl": "Język yap", "pt": "Língua yap", "ru": "япский язык", + "sv": "yapesiska", "_meta": { "dir": [ "left-to-right" @@ -11445,6 +11675,7 @@ "fr": "yangben", "ja": "ヤンベン語", "nl": "Yangben", + "sv": "yangben", "_meta": { "dir": [ "left-to-right" @@ -11463,6 +11694,7 @@ "nl": "Jenisch", "pt": "Língua yeniche", "ru": "Енишский язык", + "sv": "jeniska", "_meta": { "dir": [ "left-to-right" @@ -11490,7 +11722,7 @@ "pt": "língua iídiche", "pt_BR": "língua iídiche", "ru": "идиш", - "sl": "Jidiš", + "sl": "jidiš", "sv": "jiddisch", "zh_Hant": "意第緒語", "_meta": { @@ -11518,6 +11750,7 @@ "pl": "język joruba", "pt": "Língua iorubá", "ru": "йоруба", + "sl": "jorubščina", "sv": "yoruba", "zh_Hant": "約魯巴語", "_meta": { @@ -11536,6 +11769,7 @@ "ja": "与那国方言", "pt": "Língua Yonaguni", "ru": "Йонагунский язык", + "sv": "yonaguni", "zh_Hant": "與那國語", "_meta": { "dir": [ @@ -11562,6 +11796,8 @@ "pl": "język nieniecki", "ru": "ненецкий язык", "sv": "nentsiska", + "zh_Hans": "涅涅茨语", + "zh_Hant": "涅涅茨語", "_meta": { "dir": [ "left-to-right" @@ -11583,6 +11819,7 @@ "pt": "nheengatu", "pt_BR": "Nheengatu", "ru": "ньенгату", + "sv": "nheengatu", "_meta": { "dir": [ "left-to-right" @@ -11653,6 +11890,8 @@ "ja": "標準モロッコ・タマジクト語", "nl": "Standaardtamazight", "ru": "Стандартный марокканский берберский язык", + "sl": "knjižna maroška berberščina", + "sv": "marockansk standardberbiska", "zh_Hans": "标准摩洛哥柏柏尔语", "zh_Hant": "標準摩洛哥柏柏語", "_meta": { @@ -11708,7 +11947,7 @@ "fr": "minnan", "gl": "lingua min nam", "hu": "minnan", - "id": "Min Selatan", + "id": "Bahasa Min Selatan", "it": "min nan", "ja": "閩南語", "nb_NO": "minnan", @@ -11717,7 +11956,9 @@ "pt": "Min Nan", "pt_BR": "Min nan", "ru": "южноминьский язык", + "sl": "južna minščina", "sv": "minnan", + "zh_Hans": "闽南语", "zh_Hant": "閩南語", "_meta": { "dir": [ @@ -11776,6 +12017,7 @@ "pt": "língua zulu", "pt_BR": "língua zulu", "ru": "зулу", + "sl": "zulujščina", "sv": "zulu", "zh_Hant": "祖魯語", "_meta": { @@ -11791,10 +12033,12 @@ "ca": "llengua zuni", "de": "Zuñi", "en": "Zuni", + "eo": "zunjia", "es": "zuñi", "fi": "Zuni", "fr": "zuni", "hu": "zuni", + "id": "bahasa Zuni", "it": "zuni", "ja": "ズニ語", "nb_NO": "zunispråket", diff --git a/src/assets/translators.json b/src/assets/translators.json index da7505c38..af7c7f5d3 100644 --- a/src/assets/translators.json +++ b/src/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 283, + "commits": 286, "contributor": "kjon" }, { - "commits": 275, + "commits": 276, "contributor": "Pieter Vander Vennet" }, { @@ -53,7 +53,7 @@ "contributor": "Reza Almanda" }, { - "commits": 23, + "commits": 24, "contributor": "Lucas" }, { @@ -204,6 +204,10 @@ "commits": 6, "contributor": "lvgx" }, + { + "commits": 5, + "contributor": "deep map" + }, { "commits": 5, "contributor": "Piotr Strebski" @@ -272,6 +276,10 @@ "commits": 4, "contributor": "Jan Zabel" }, + { + "commits": 3, + "contributor": "Emory Shaw" + }, { "commits": 3, "contributor": "Alexey Lutskyi" @@ -328,10 +336,6 @@ "commits": 3, "contributor": "SiegbjornSitumeang" }, - { - "commits": 2, - "contributor": "Emory Shaw" - }, { "commits": 2, "contributor": "lmagreault" @@ -440,10 +444,6 @@ "commits": 1, "contributor": "Stéphane De Greef" }, - { - "commits": 1, - "contributor": "deep map" - }, { "commits": 1, "contributor": "Falk Rund" From adcd130259497d9ab40585bc5820a9c335255640 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 01:12:42 +0200 Subject: [PATCH 035/134] Chore: housekeeping --- Docs/BuiltinQuestions.md | 21 ++++ Docs/Layers/recycling.md | 22 ++++- Docs/Layers/waste_disposal.md | 2 +- Docs/TagInfo/mapcomplete_personal.json | 9 ++ Docs/TagInfo/mapcomplete_waste.json | 9 ++ .../mapcomplete-changes.json | 97 +++++-------------- langs/layers/en.json | 9 ++ langs/themes/ca.json | 11 +++ langs/themes/da.json | 12 +++ langs/themes/de.json | 12 +++ langs/themes/en.json | 12 +++ langs/themes/es.json | 12 +++ langs/themes/fr.json | 12 +++ langs/themes/nl.json | 12 +++ src/Logic/DetermineLayout.ts | 32 +++--- src/Logic/State/FeatureSwitchState.ts | 7 +- src/Logic/Web/QueryParameters.ts | 2 +- src/assets/contributors.json | 20 ++-- src/assets/translators.json | 26 ++--- 19 files changed, 227 insertions(+), 112 deletions(-) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 65dc34aed..5a2a27015 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -52,6 +52,7 @@ Special library layer which does not need a '.questions'-prefix before being imp + [internet-fee](#internet-fee) + [internet-ssid](#internet-ssid) + [luminous_or_lit](#luminous_or_lit) + + [survey_date](#survey_date) @@ -114,6 +115,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) [](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) +[](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D) @@ -754,6 +756,25 @@ The question is *Is this object lit or does it emit light?* - *This object emits light* corresponds with `luminous=yes` - *This object is lit externally, e.g. by a spotlight or other lights* corresponds with `lit=yes` - *This object does not emit light and is not lighted by externally* corresponds with `lit=no&luminous=no` + + + + +### survey_date + + + +The question is *When was this object last surveyed?* + +This rendering asks information about the property [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) + +This is rendered with `This object was last surveyed on {survey:date}` + + + + + + - *This object was last surveyed today* corresponds with `survey:date=` This document is autogenerated from [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json) diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index 4fa8aa799..2691e5a66 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -14,7 +14,7 @@ A layer with recycling containers and centres - - This layer is shown at zoomlevel **11** and higher + - This layer is shown at zoomlevel **10** and higher @@ -55,6 +55,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/access#values) [access](https://wiki.openstreetmap.org/wiki/Key:access) | [string](../SpecialInputElements.md#string) | [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) [residents](https://wiki.openstreetmap.org/wiki/Tag:access%3Dresidents) [private](https://wiki.openstreetmap.org/wiki/Tag:access%3Dprivate) +[](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D) @@ -341,6 +342,25 @@ This is rendered with `This recycling facility can be used by {access}` +### survey_date + + + +The question is *When was this object last surveyed?* + +This rendering asks information about the property [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) + +This is rendered with `This object was last surveyed on {survey:date}` + + + + + + - *This object was last surveyed today* corresponds with `survey:date=` + + + + ### leftover-questions diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md index 56f6b8196..8a36cd499 100644 --- a/Docs/Layers/waste_disposal.md +++ b/Docs/Layers/waste_disposal.md @@ -14,7 +14,7 @@ Waste Disposal Bin, medium to large bin for disposal of (household) waste - - This layer is shown at zoomlevel **18** and higher + - This layer is shown at zoomlevel **12** and higher diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 77589487f..620c68015 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -10311,6 +10311,15 @@ "description": "Layer 'Recycling' shows access=private with a fixed text, namely 'This recycling facility is only for private use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "private" }, + { + "key": "survey:date", + "description": "Layer 'Recycling' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "survey:date", + "description": "Layer 'Recycling' shows survey:date= with a fixed text, namely 'This object was last surveyed today' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key survey:date.", + "value": "" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer Primary and secondary schools showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index fdbb16f0b..29c3c039f 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -350,6 +350,15 @@ "description": "Layer 'Recycling' shows access=private with a fixed text, namely 'This recycling facility is only for private use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "private" }, + { + "key": "survey:date", + "description": "Layer 'Recycling' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Waste')" + }, + { + "key": "survey:date", + "description": "Layer 'Recycling' shows survey:date= with a fixed text, namely 'This object was last surveyed today' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste') Picking this answer will delete the key survey:date.", + "value": "" + }, { "key": "amenity", "description": "The MapComplete theme Waste has a layer Waste Disposal Bins showing features with this tag", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index deda66b65..56555e871 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "nl": "Toon wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -26,9 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "nl": "Centerpunt van changeset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -39,51 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung gemacht von {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -92,27 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Sprache wurde diese Änderung vorgenommen?", - "nl": "In welke locale (taal) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Usersprache ist {locale}", - "nl": "De gebruikerstaal is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "de": "Änderung vorgenommen mit {host}", - "nl": "Wijziging gemaakt met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -133,12 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -480,9 +452,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themenaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -498,9 +468,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -516,9 +484,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -535,9 +501,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -554,9 +518,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -572,9 +534,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "nl": "De taal van de bijdrager is {search}" + "en": "User language (iso-code) {search}" } } ] @@ -590,9 +550,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -603,9 +561,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Changeset fügte mindestens ein Bild hinzu", - "nl": "Changeset bevat minstens één afbeelding" + "en": "Changeset added at least one image" } } ] @@ -620,8 +576,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier" + "en": "More statistics can be found here" } }, { diff --git a/langs/layers/en.json b/langs/layers/en.json index eda2eeb64..4959af6b1 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -7318,6 +7318,15 @@ }, "question": "Is smoking allowed at {title()}?" }, + "survey_date": { + "mappings": { + "0": { + "then": "This object was last surveyed today" + } + }, + "question": "When was this object last surveyed?", + "render": "This object was last surveyed on {survey:date}" + }, "website": { "question": "What is the website of {title()}?" }, diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 260c05df1..a14b2fb2a 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -769,6 +769,17 @@ }, "kerbs_and_crossings": { "description": "Un mapa amb voreres i encreuaments.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "title": "un pas de vianants" + } + } + } + } + }, "title": "Vorals i encreuaments" }, "maproulette": { diff --git a/langs/themes/da.json b/langs/themes/da.json index 3a076d1b5..4aba45568 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -610,6 +610,18 @@ }, "kerbs_and_crossings": { "description": "Et kort, der viser kantsten og overgange.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Overgang for fodgængere og/eller cyklister", + "title": "en overgang" + } + } + } + } + }, "title": "Kantsten og overgange" }, "maproulette": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 40aff3f38..ad5b0d313 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -927,6 +927,18 @@ }, "kerbs_and_crossings": { "description": "Eine Karte mit Bordsteinen und Überwegen.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Kreuzung für Fußgänger und/oder Radfahrer", + "title": "eine Kreuzung" + } + } + } + } + }, "title": "Bordsteine und Überwege" }, "mapcomplete-changes": { diff --git a/langs/themes/en.json b/langs/themes/en.json index e1198eaee..75359d160 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -927,6 +927,18 @@ }, "kerbs_and_crossings": { "description": "A map showing kerbs and crossings.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Crossing for pedestrians and/or cyclists", + "title": "a crossing" + } + } + } + } + }, "title": "Kerbs and crossings" }, "mapcomplete-changes": { diff --git a/langs/themes/es.json b/langs/themes/es.json index 7c6659c80..759a8a209 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -769,6 +769,18 @@ }, "kerbs_and_crossings": { "description": "Un mapa que muestra bordillos y cruces.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Cruce para peatones y/o ciclistas", + "title": "un cruce" + } + } + } + } + }, "title": "Bordillos y cruces" }, "maproulette": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 96daba742..1d6dbd17f 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -763,6 +763,18 @@ }, "kerbs_and_crossings": { "description": "Une carte affichant les ressauts et traversées.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Traversée pour piétons et/ou cyclistes", + "title": "une traversée" + } + } + } + } + }, "title": "Ressauts et traversées" }, "maproulette": { diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 5d5bac5ef..2affa3f47 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -922,6 +922,18 @@ }, "kerbs_and_crossings": { "description": "Een kaart met stoepranden en oversteekplaatsen.", + "layers": { + "1": { + "override": { + "=presets": { + "0": { + "description": "Oversteekplaats voor voetgangers en/of fietsers", + "title": "een oversteekplaats" + } + } + } + } + }, "title": "Stoepranden en oversteekplaatsen" }, "mapcomplete-changes": { diff --git a/src/Logic/DetermineLayout.ts b/src/Logic/DetermineLayout.ts index 1316a241b..c9abdbaaa 100644 --- a/src/Logic/DetermineLayout.ts +++ b/src/Logic/DetermineLayout.ts @@ -1,26 +1,30 @@ import LayoutConfig from "../Models/ThemeConfig/LayoutConfig" -import {QueryParameters} from "./Web/QueryParameters" -import {AllKnownLayouts} from "../Customizations/AllKnownLayouts" -import {FixedUiElement} from "../UI/Base/FixedUiElement" -import {Utils} from "../Utils" +import { QueryParameters } from "./Web/QueryParameters" +import { AllKnownLayouts } from "../Customizations/AllKnownLayouts" +import { FixedUiElement } from "../UI/Base/FixedUiElement" +import { Utils } from "../Utils" import Combine from "../UI/Base/Combine" -import {SubtleButton} from "../UI/Base/SubtleButton" +import { SubtleButton } from "../UI/Base/SubtleButton" import BaseUIElement from "../UI/BaseUIElement" -import {UIEventSource} from "./UIEventSource" -import {LocalStorageSource} from "./Web/LocalStorageSource" +import { UIEventSource } from "./UIEventSource" +import { LocalStorageSource } from "./Web/LocalStorageSource" import LZString from "lz-string" -import {FixLegacyTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert" -import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson" +import { FixLegacyTheme } from "../Models/ThemeConfig/Conversion/LegacyJsonConvert" +import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson" import known_layers from "../assets/generated/known_layers.json" -import {PrepareTheme} from "../Models/ThemeConfig/Conversion/PrepareTheme" +import { PrepareTheme } from "../Models/ThemeConfig/Conversion/PrepareTheme" import licenses from "../assets/generated/license_info.json" import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig" -import {FixImages} from "../Models/ThemeConfig/Conversion/FixImages" +import { FixImages } from "../Models/ThemeConfig/Conversion/FixImages" import Svg from "../Svg" import questions from "../assets/generated/layers/questions.json" -import {DoesImageExist, PrevalidateTheme, ValidateThemeAndLayers,} from "../Models/ThemeConfig/Conversion/Validation" -import {DesugaringContext} from "../Models/ThemeConfig/Conversion/Conversion" -import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson" +import { + DoesImageExist, + PrevalidateTheme, + ValidateThemeAndLayers, +} from "../Models/ThemeConfig/Conversion/Validation" +import { DesugaringContext } from "../Models/ThemeConfig/Conversion/Conversion" +import { TagRenderingConfigJson } from "../Models/ThemeConfig/Json/TagRenderingConfigJson" import Hash from "./Web/Hash" export default class DetermineLayout { diff --git a/src/Logic/State/FeatureSwitchState.ts b/src/Logic/State/FeatureSwitchState.ts index 852075b26..ebdb057c9 100644 --- a/src/Logic/State/FeatureSwitchState.ts +++ b/src/Logic/State/FeatureSwitchState.ts @@ -10,7 +10,12 @@ import { Utils } from "../../Utils" class FeatureSwitchUtils { static initSwitch(key: string, deflt: boolean, documentation: string): UIEventSource { const defaultValue = deflt - const queryParam = QueryParameters.GetQueryParameter(key, "" + defaultValue, documentation, {stackOffset: -1}) + const queryParam = QueryParameters.GetQueryParameter( + key, + "" + defaultValue, + documentation, + { stackOffset: -1 } + ) // It takes the current layout, extracts the default value for this query parameter. A query parameter event source is then retrieved and flattened return queryParam.sync( diff --git a/src/Logic/Web/QueryParameters.ts b/src/Logic/Web/QueryParameters.ts index 9a05548a0..208c8e8dd 100644 --- a/src/Logic/Web/QueryParameters.ts +++ b/src/Logic/Web/QueryParameters.ts @@ -66,7 +66,7 @@ export class QueryParameters { documentation?: string ): UIEventSource { return UIEventSource.asBoolean( - QueryParameters.GetQueryParameter(key, "" + deflt, documentation, {stackOffset: -1}) + QueryParameters.GetQueryParameter(key, "" + deflt, documentation, { stackOffset: -1 }) ) } diff --git a/src/assets/contributors.json b/src/assets/contributors.json index 2a7fc54dd..10196f958 100644 --- a/src/assets/contributors.json +++ b/src/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 5819, + "commits": 5849, "contributor": "Pieter Vander Vennet" }, { - "commits": 384, + "commits": 388, "contributor": "Robin van der Linde" }, { @@ -61,7 +61,7 @@ "contributor": "AlexanderRebai" }, { - "commits": 19, + "commits": 20, "contributor": "dependabot[bot]" }, { @@ -110,11 +110,11 @@ }, { "commits": 10, - "contributor": "LiamSimons" + "contributor": "Thibault Molleman" }, { - "commits": 9, - "contributor": "Thibault Molleman" + "commits": 10, + "contributor": "LiamSimons" }, { "commits": 9, @@ -128,6 +128,10 @@ "commits": 8, "contributor": "Mateusz Konieczny" }, + { + "commits": 7, + "contributor": "pelderson" + }, { "commits": 7, "contributor": "OliNau" @@ -148,10 +152,6 @@ "commits": 6, "contributor": "danieldegroot2" }, - { - "commits": 6, - "contributor": "pelderson" - }, { "commits": 4, "contributor": "Nadhem" diff --git a/src/assets/translators.json b/src/assets/translators.json index af7c7f5d3..7c129058c 100644 --- a/src/assets/translators.json +++ b/src/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 286, + "commits": 289, "contributor": "kjon" }, { - "commits": 276, + "commits": 277, "contributor": "Pieter Vander Vennet" }, { @@ -50,11 +50,11 @@ }, { "commits": 25, - "contributor": "Reza Almanda" + "contributor": "Lucas" }, { - "commits": 24, - "contributor": "Lucas" + "commits": 25, + "contributor": "Reza Almanda" }, { "commits": 22, @@ -124,6 +124,10 @@ "commits": 10, "contributor": "Irina" }, + { + "commits": 9, + "contributor": "deep map" + }, { "commits": 9, "contributor": "Jaime Marquínez Ferrándiz" @@ -204,10 +208,6 @@ "commits": 6, "contributor": "lvgx" }, - { - "commits": 5, - "contributor": "deep map" - }, { "commits": 5, "contributor": "Piotr Strebski" @@ -248,6 +248,10 @@ "commits": 5, "contributor": "Alexey Shabanov" }, + { + "commits": 4, + "contributor": "Emory Shaw" + }, { "commits": 4, "contributor": "André Marcelo Alvarenga" @@ -276,10 +280,6 @@ "commits": 4, "contributor": "Jan Zabel" }, - { - "commits": 3, - "contributor": "Emory Shaw" - }, { "commits": 3, "contributor": "Alexey Lutskyi" From 0d88c7e878c52e3c12e3e561c96d9e7a759960a7 Mon Sep 17 00:00:00 2001 From: kjon Date: Fri, 28 Jul 2023 06:08:58 +0000 Subject: [PATCH 036/134] Translated using Weblate (German) Currently translated at 100.0% (502 of 502 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/de.json b/langs/de.json index 2995ce4dd..ff399a2cd 100644 --- a/langs/de.json +++ b/langs/de.json @@ -14,7 +14,7 @@ "available": "Diese Gemeinschaft spricht {native}", "intro": "Treten Sie mit anderen Menschen in Kontakt, um sie kennen zu lernen, von ihnen zu lernen, …", "notAvailable": "Diese Gemeinschaft spricht nicht {native}", - "title": "Index der Community" + "title": "Mit anderen in Kontakt treten" }, "delete": { "cancel": "Abbrechen", From fb290777902b120de1c70415838444ff9b0e3e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 27 Jul 2023 23:40:10 +0000 Subject: [PATCH 037/134] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 64.3% (323 of 502 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nb_NO/ --- langs/nb_NO.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/langs/nb_NO.json b/langs/nb_NO.json index de0ede216..7856c11fb 100644 --- a/langs/nb_NO.json +++ b/langs/nb_NO.json @@ -1,4 +1,7 @@ { + "advanced": { + "title": "Avanserte funksjoner" + }, "centerMessage": { "loadingData": "Laster inn data …", "ready": "Ferdig", From 91089072391cef7867f67eece44eecfe02f79ed5 Mon Sep 17 00:00:00 2001 From: kjon Date: Fri, 28 Jul 2023 06:10:20 +0000 Subject: [PATCH 038/134] Translated using Weblate (German) Currently translated at 100.0% (3054 of 3054 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/ --- langs/layers/de.json | 537 +++++++++++++++++++++++-------------------- 1 file changed, 288 insertions(+), 249 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 4d9dab138..c8b2bf68c 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -35,6 +35,16 @@ "1": { "title": "eine freistehende Posterbox" }, + "10": { + "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", + "title": "ein Schild" + }, + "11": { + "title": "eine Skulptur" + }, + "12": { + "title": "eine Wandmalerei" + }, "2": { "title": "eine wandmontierte Posterbox" }, @@ -61,16 +71,6 @@ }, "9": { "title": "ein Totem" - }, - "10": { - "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", - "title": "ein Schild" - }, - "11": { - "title": "eine Skulptur" - }, - "12": { - "title": "eine Wandmalerei" } }, "tagRenderings": { @@ -165,6 +165,9 @@ "1": { "then": "Dies ist ein Brett" }, + "10": { + "then": "Dies ist eine Wandmalerei" + }, "2": { "then": "Dies ist eine Litfaßsäule" }, @@ -188,9 +191,6 @@ }, "9": { "then": "Dies ist ein Totem" - }, - "10": { - "then": "Dies ist eine Wandmalerei" } }, "question": "Welche Art von Werbung ist das?", @@ -205,6 +205,9 @@ "1": { "then": "Brett" }, + "10": { + "then": "Wandmalerei" + }, "2": { "then": "Posterbox" }, @@ -228,9 +231,6 @@ }, "9": { "then": "Totem" - }, - "10": { - "then": "Wandmalerei" } } } @@ -312,6 +312,15 @@ "1": { "then": "Wandbild" }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" + }, "2": { "then": "Malerei" }, @@ -335,15 +344,6 @@ }, "9": { "then": "Relief" - }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1830,6 +1830,27 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" + }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1853,27 +1874,6 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" - }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1929,30 +1929,6 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" - }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1983,6 +1959,9 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -2013,11 +1992,32 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3555,6 +3555,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3578,15 +3587,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3635,6 +3635,15 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" + }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3658,15 +3667,6 @@ }, "9": { "then": "Der Radweg ist aus Schotter" - }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4606,30 +4606,6 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." - }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4660,6 +4636,9 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4674,6 +4653,27 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4780,6 +4780,21 @@ "1": { "then": "Dies ist eine Pommesbude" }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" + }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4803,21 +4818,6 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" - }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Was für Essen gibt es hier?", @@ -6036,6 +6036,19 @@ } } }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } + }, "2": { "options": { "0": { @@ -6091,19 +6104,6 @@ "question": "Nur offene Notizen anzeigen" } } - }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } } }, "name": "OpenStreetMap-Hinweise", @@ -6432,6 +6432,21 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." + }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6455,21 +6470,6 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." - }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -7318,6 +7318,15 @@ }, "question": "Ist das Rauchen in {title()} erlaubt?" }, + "survey_date": { + "mappings": { + "0": { + "then": "Dieses Objekt wurde heute zuletzt geprüft" + } + }, + "question": "Wann wurde dieses Objekt zuletzt geprüft?", + "render": "Dieses Objekt wurde zuletzt geprüft am {survey:date}" + }, "website": { "question": "Wie lautet die Webseite von {title()}?" }, @@ -7443,30 +7452,6 @@ "1": { "question": "Recycling von Batterien" }, - "2": { - "question": "Recycling von Getränkekartons" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" - }, "10": { "question": "Recycling von Glas" }, @@ -7497,11 +7482,35 @@ "19": { "question": "Recycling von Restabfällen" }, + "2": { + "question": "Recycling von Getränkekartons" + }, "20": { "question": "Recycling von Druckerpatronen" }, "21": { "question": "Recycling von Fahrrädern" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" } } }, @@ -7569,30 +7578,6 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" - }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -7623,6 +7608,9 @@ "19": { "then": "Schuhe können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -7637,6 +7625,27 @@ }, "24": { "then": "Fahrräder können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -8308,6 +8317,12 @@ }, "question": "Hat die Treppe einen Handlauf?" }, + "multilevels": { + "override": { + "question": "Zwischen welchen Stockwerken befindet sich diese Treppe?", + "render": "Diese Treppe ist zwischen den Stockwerken {level}" + } + }, "ramp": { "mappings": { "0": { @@ -8434,6 +8449,12 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" + }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -8457,12 +8478,6 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" - }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -8721,6 +8736,18 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, + "payment-options": { + "override": { + "mappings+": { + "0": { + "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" + }, + "1": { + "then": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart" + } + } + } + }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8934,6 +8961,11 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { + "opening_hours": { + "override": { + "question": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?" + } + }, "toilet-access": { "mappings": { "0": { @@ -9406,6 +9438,13 @@ } } }, + "language_picker": { + "mappings": { + "0": { + "then": "Die Sprache wurde über einen URL-Parameter gesetzt und kann nicht vom Benutzer eingestellt werden.²" + } + } + }, "mangrove-keys": { "render": "Laden Sie den privaten Schlüssel für Ihr Mangrove-Konto herunter

Jeder, der diese Datei besitzt, kann mit Ihrer Identität Rezensionen vornehmen

" }, @@ -9527,6 +9566,27 @@ "1": { "question": "Verkauf von Getränken" }, + "10": { + "question": "Verkauf von Milch" + }, + "11": { + "question": "Verkauf von Brot" + }, + "12": { + "question": "Verkauf von Eiern" + }, + "13": { + "question": "Verkauf von Käse" + }, + "14": { + "question": "Verkauf von Honig" + }, + "15": { + "question": "Verkauf von Kartoffeln" + }, + "16": { + "question": "Verkauf von Blumen" + }, "2": { "question": "Verkauf von Süßigkeiten" }, @@ -9550,27 +9610,6 @@ }, "9": { "question": "Verkauf von Fahrradschläuchen" - }, - "10": { - "question": "Verkauf von Milch" - }, - "11": { - "question": "Verkauf von Brot" - }, - "12": { - "question": "Verkauf von Eiern" - }, - "13": { - "question": "Verkauf von Käse" - }, - "14": { - "question": "Verkauf von Honig" - }, - "15": { - "question": "Verkauf von Kartoffeln" - }, - "16": { - "question": "Verkauf von Blumen" } } } @@ -9611,6 +9650,24 @@ "1": { "then": "Süßigkeiten werden verkauft" }, + "10": { + "then": "Brot wird verkauft" + }, + "11": { + "then": "Eier werden verkauft" + }, + "12": { + "then": "Käse wird verkauft" + }, + "13": { + "then": "Honig wird verkauft" + }, + "14": { + "then": "Kartoffeln werden verkauft" + }, + "15": { + "then": "Blumen werden verkauft" + }, "2": { "then": "Lebensmittel werden verkauft" }, @@ -9634,24 +9691,6 @@ }, "9": { "then": "Milch wird verkauft" - }, - "10": { - "then": "Brot wird verkauft" - }, - "11": { - "then": "Eier werden verkauft" - }, - "12": { - "then": "Käse wird verkauft" - }, - "13": { - "then": "Honig wird verkauft" - }, - "14": { - "then": "Kartoffeln werden verkauft" - }, - "15": { - "then": "Blumen werden verkauft" } }, "question": "Was wird in diesem Automaten verkauft?", @@ -9988,4 +10027,4 @@ } } } -} \ No newline at end of file +} From ea4ccee5843f3800325df47e1217c7e59be67529 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 13:32:07 +0200 Subject: [PATCH 039/134] Chore: translation sync --- assets/layers/questions/questions.json | 9 +- assets/layers/usersettings/usersettings.json | 3 +- .../mapcomplete-changes.json | 97 +++- langs/layers/de.json | 521 +++++++++--------- 4 files changed, 328 insertions(+), 302 deletions(-) diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 1f5672680..3774c0a91 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -2154,20 +2154,23 @@ { "id": "survey_date", "question": { - "en": "When was this object last surveyed?" + "en": "When was this object last surveyed?", + "de": "Wann wurde dieses Objekt zuletzt geprüft?" }, "freeform": { "key": "survey:date", "type": "date" }, "render": { - "en": "This object was last surveyed on {survey:date}" + "en": "This object was last surveyed on {survey:date}", + "de": "Dieses Objekt wurde zuletzt geprüft am {survey:date}" }, "mappings": [ { "if": "survey:date:={_now:date}", "then": { - "en": "This object was last surveyed today" + "en": "This object was last surveyed today", + "de": "Dieses Objekt wurde heute zuletzt geprüft" } } ] diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index 2f4fa5671..183ff5742 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -39,7 +39,8 @@ "if": "__url_parameter_initialized:language=yes", "icon": "./assets/layers/usersettings/translate_disabled.svg", "then": { - "en": "The language was set via an URL-parameter and cannot be set by the user.²" + "en": "The language was set via an URL-parameter and cannot be set by the user.²", + "de": "Die Sprache wurde über einen URL-Parameter gesetzt und kann nicht vom Benutzer eingestellt werden.²" } } ] diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 56555e871..deda66b65 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,19 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +26,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +39,51 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}" } }, { @@ -74,19 +92,27 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +133,12 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}" }, "freeform": { "key": "editor" @@ -452,7 +480,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +498,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +516,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +535,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +554,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +572,9 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +590,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +603,9 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +620,8 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier" } }, { diff --git a/langs/layers/de.json b/langs/layers/de.json index c8b2bf68c..362d52f67 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -35,16 +35,6 @@ "1": { "title": "eine freistehende Posterbox" }, - "10": { - "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", - "title": "ein Schild" - }, - "11": { - "title": "eine Skulptur" - }, - "12": { - "title": "eine Wandmalerei" - }, "2": { "title": "eine wandmontierte Posterbox" }, @@ -71,6 +61,16 @@ }, "9": { "title": "ein Totem" + }, + "10": { + "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", + "title": "ein Schild" + }, + "11": { + "title": "eine Skulptur" + }, + "12": { + "title": "eine Wandmalerei" } }, "tagRenderings": { @@ -165,9 +165,6 @@ "1": { "then": "Dies ist ein Brett" }, - "10": { - "then": "Dies ist eine Wandmalerei" - }, "2": { "then": "Dies ist eine Litfaßsäule" }, @@ -191,6 +188,9 @@ }, "9": { "then": "Dies ist ein Totem" + }, + "10": { + "then": "Dies ist eine Wandmalerei" } }, "question": "Welche Art von Werbung ist das?", @@ -205,9 +205,6 @@ "1": { "then": "Brett" }, - "10": { - "then": "Wandmalerei" - }, "2": { "then": "Posterbox" }, @@ -231,6 +228,9 @@ }, "9": { "then": "Totem" + }, + "10": { + "then": "Wandmalerei" } } } @@ -312,15 +312,6 @@ "1": { "then": "Wandbild" }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" - }, "2": { "then": "Malerei" }, @@ -344,6 +335,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1830,27 +1830,6 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" - }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1874,6 +1853,27 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" + }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1929,6 +1929,30 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" + }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1959,9 +1983,6 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -1992,32 +2013,11 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3555,15 +3555,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3587,6 +3578,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3635,15 +3635,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3667,6 +3658,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4606,6 +4606,30 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." + }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4636,9 +4660,6 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4653,27 +4674,6 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4780,21 +4780,6 @@ "1": { "then": "Dies ist eine Pommesbude" }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" - }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4818,6 +4803,21 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" + }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Was für Essen gibt es hier?", @@ -6036,19 +6036,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } - }, "2": { "options": { "0": { @@ -6104,6 +6091,19 @@ "question": "Nur offene Notizen anzeigen" } } + }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } } }, "name": "OpenStreetMap-Hinweise", @@ -6432,21 +6432,6 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." - }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6470,6 +6455,21 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." + }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -7452,6 +7452,30 @@ "1": { "question": "Recycling von Batterien" }, + "2": { + "question": "Recycling von Getränkekartons" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" + }, "10": { "question": "Recycling von Glas" }, @@ -7482,35 +7506,11 @@ "19": { "question": "Recycling von Restabfällen" }, - "2": { - "question": "Recycling von Getränkekartons" - }, "20": { "question": "Recycling von Druckerpatronen" }, "21": { "question": "Recycling von Fahrrädern" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" } } }, @@ -7578,6 +7578,30 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" + }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -7608,9 +7632,6 @@ "19": { "then": "Schuhe können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -7625,27 +7646,6 @@ }, "24": { "then": "Fahrräder können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -8317,12 +8317,6 @@ }, "question": "Hat die Treppe einen Handlauf?" }, - "multilevels": { - "override": { - "question": "Zwischen welchen Stockwerken befindet sich diese Treppe?", - "render": "Diese Treppe ist zwischen den Stockwerken {level}" - } - }, "ramp": { "mappings": { "0": { @@ -8449,12 +8443,6 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" - }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -8478,6 +8466,12 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" + }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -8736,18 +8730,6 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" - }, - "1": { - "then": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart" - } - } - } - }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8961,11 +8943,6 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { - "opening_hours": { - "override": { - "question": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?" - } - }, "toilet-access": { "mappings": { "0": { @@ -9566,27 +9543,6 @@ "1": { "question": "Verkauf von Getränken" }, - "10": { - "question": "Verkauf von Milch" - }, - "11": { - "question": "Verkauf von Brot" - }, - "12": { - "question": "Verkauf von Eiern" - }, - "13": { - "question": "Verkauf von Käse" - }, - "14": { - "question": "Verkauf von Honig" - }, - "15": { - "question": "Verkauf von Kartoffeln" - }, - "16": { - "question": "Verkauf von Blumen" - }, "2": { "question": "Verkauf von Süßigkeiten" }, @@ -9610,6 +9566,27 @@ }, "9": { "question": "Verkauf von Fahrradschläuchen" + }, + "10": { + "question": "Verkauf von Milch" + }, + "11": { + "question": "Verkauf von Brot" + }, + "12": { + "question": "Verkauf von Eiern" + }, + "13": { + "question": "Verkauf von Käse" + }, + "14": { + "question": "Verkauf von Honig" + }, + "15": { + "question": "Verkauf von Kartoffeln" + }, + "16": { + "question": "Verkauf von Blumen" } } } @@ -9650,24 +9627,6 @@ "1": { "then": "Süßigkeiten werden verkauft" }, - "10": { - "then": "Brot wird verkauft" - }, - "11": { - "then": "Eier werden verkauft" - }, - "12": { - "then": "Käse wird verkauft" - }, - "13": { - "then": "Honig wird verkauft" - }, - "14": { - "then": "Kartoffeln werden verkauft" - }, - "15": { - "then": "Blumen werden verkauft" - }, "2": { "then": "Lebensmittel werden verkauft" }, @@ -9691,6 +9650,24 @@ }, "9": { "then": "Milch wird verkauft" + }, + "10": { + "then": "Brot wird verkauft" + }, + "11": { + "then": "Eier werden verkauft" + }, + "12": { + "then": "Käse wird verkauft" + }, + "13": { + "then": "Honig wird verkauft" + }, + "14": { + "then": "Kartoffeln werden verkauft" + }, + "15": { + "then": "Blumen werden verkauft" } }, "question": "Was wird in diesem Automaten verkauft?", @@ -10027,4 +10004,4 @@ } } } -} +} \ No newline at end of file From 393d4e75d8be0373a09778b0691672ead3eb9d8e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 13:34:10 +0200 Subject: [PATCH 040/134] Chore: translation sync --- langs/layers/de.json | 6 +++--- langs/layers/en.json | 6 +++--- langs/layers/nl.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 362d52f67..3f2b2918f 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5163,13 +5163,13 @@ "hs-club-mate": { "mappings": { "0": { - "then": "In diesem Hackerspace gibt es Club Mate" + "then": "In diesem Hackerspace gibt es Club-Mate" }, "1": { - "then": "In diesem Hackerspace gibt es kein Club Mate" + "then": "In diesem Hackerspace gibt es kein Club-Mate" } }, - "question": "Gibt es in diesem Hackerspace Club Mate?" + "question": "Gibt es in diesem Hackerspace Club-Mate?" }, "is_makerspace": { "mappings": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 4959af6b1..bbbdb9367 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5163,13 +5163,13 @@ "hs-club-mate": { "mappings": { "0": { - "then": "This hackerspace serves club mate" + "then": "This hackerspace serves Club-Mate" }, "1": { - "then": "This hackerspace does not serve club mate" + "then": "This hackerspace does not serve Club-Mate" } }, - "question": "Does this hackerspace serve Club Mate?" + "question": "Does this hackerspace serve Club-Mate?" }, "is_makerspace": { "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index ff66c6600..477ddd2c3 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4939,13 +4939,13 @@ "hs-club-mate": { "mappings": { "0": { - "then": "Deze hackerspace biedt clube-mate aan" + "then": "Deze hackerspace biedt Club-Mate aan" }, "1": { - "then": "Deze hackerspace biedt geen club-mate aan" + "then": "Deze hackerspace biedt geen Club-Mate aan" } }, - "question": "Biedt deze hackerspace club-mate aan?" + "question": "Biedt deze hackerspace Club-Mate aan?" }, "is_makerspace": { "mappings": { From 56ea1163bb7c272cec717076da452ba069e82b3c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 14:11:00 +0200 Subject: [PATCH 041/134] Themes: add extra check so that in a mapping cannot override the , fix two such instances --- assets/layers/climbing_gym/climbing_gym.json | 1 - assets/themes/campersite/campersite.json | 9 +- .../ThemeConfig/Conversion/Validation.ts | 227 +++++++++++------- 3 files changed, 145 insertions(+), 92 deletions(-) diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json index 7948a2b9e..ae085eda4 100644 --- a/assets/layers/climbing_gym/climbing_gym.json +++ b/assets/layers/climbing_gym/climbing_gym.json @@ -135,7 +135,6 @@ "de": "Kletterschuhe können hier ausgeliehen werden" }, "addExtraTags": [ - "service:climbing_shoes:rental:fee=", "service:climbing_shoes:rental:charge=" ] }, diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index 64dc9a020..40eecd571 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -231,12 +231,7 @@ } }, { - "if": { - "and": [ - "fee=no", - "charge=" - ] - }, + "if": "fee=no", "then": { "en": "Can be used for free", "id": "Boleh digunakan tanpa bayaran", @@ -1562,4 +1557,4 @@ ] }, "credits": "joost schouppe" -} \ No newline at end of file +} diff --git a/src/Models/ThemeConfig/Conversion/Validation.ts b/src/Models/ThemeConfig/Conversion/Validation.ts index 6588e5edf..89fe06697 100644 --- a/src/Models/ThemeConfig/Conversion/Validation.ts +++ b/src/Models/ThemeConfig/Conversion/Validation.ts @@ -1,21 +1,22 @@ -import { DesugaringStep, Each, Fuse, On } from "./Conversion" -import { LayerConfigJson } from "../Json/LayerConfigJson" +import {DesugaringStep, Each, Fuse, On} from "./Conversion" +import {LayerConfigJson} from "../Json/LayerConfigJson" import LayerConfig from "../LayerConfig" -import { Utils } from "../../../Utils" +import {Utils} from "../../../Utils" import Constants from "../../Constants" -import { Translation } from "../../../UI/i18n/Translation" -import { LayoutConfigJson } from "../Json/LayoutConfigJson" +import {Translation} from "../../../UI/i18n/Translation" +import {LayoutConfigJson} from "../Json/LayoutConfigJson" import LayoutConfig from "../LayoutConfig" -import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson" -import { TagUtils } from "../../../Logic/Tags/TagUtils" -import { ExtractImages } from "./FixImages" -import { And } from "../../../Logic/Tags/And" +import {TagRenderingConfigJson} from "../Json/TagRenderingConfigJson" +import {TagUtils} from "../../../Logic/Tags/TagUtils" +import {ExtractImages} from "./FixImages" +import {And} from "../../../Logic/Tags/And" import Translations from "../../../UI/i18n/Translations" import Svg from "../../../Svg" import FilterConfigJson from "../Json/FilterConfigJson" import DeleteConfig from "../DeleteConfig" -import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson" +import {QuestionableTagRenderingConfigJson} from "../Json/QuestionableTagRenderingConfigJson" import Validators from "../../../UI/InputElement/Validators" +import TagRenderingConfig from "../TagRenderingConfig"; class ValidateLanguageCompleteness extends DesugaringStep { private readonly _languages: string[] @@ -46,12 +47,12 @@ class ValidateLanguageCompleteness extends DesugaringStep { .forEach((missing) => { errors.push( context + - "A theme should be translation-complete for " + - neededLanguage + - ", but it lacks a translation for " + - missing.context + - ".\n\tThe known translation is " + - missing.tr.textFor("en") + "A theme should be translation-complete for " + + neededLanguage + + ", but it lacks a translation for " + + missing.context + + ".\n\tThe known translation is " + + missing.tr.textFor("en") ) }) } @@ -85,7 +86,7 @@ export class DoesImageExist extends DesugaringStep { context: string ): { result: string; errors?: string[]; warnings?: string[]; information?: string[] } { if (this._ignore?.has(image)) { - return { result: image } + return {result: image} } const errors = [] @@ -93,22 +94,22 @@ export class DoesImageExist extends DesugaringStep { const information = [] if (image.indexOf("{") >= 0) { information.push("Ignoring image with { in the path: " + image) - return { result: image } + return {result: image} } if (image === "assets/SocialImage.png") { - return { result: image } + return {result: image} } if (image.match(/[a-z]*/)) { if (Svg.All[image + ".svg"] !== undefined) { // This is a builtin img, e.g. 'checkmark' or 'crosshair' - return { result: image } + return {result: image} } } if (image.startsWith("<") && image.endsWith(">")) { // This is probably HTML, you're on your own here - return { result: image } + return {result: image} } if (!this._knownImagePaths.has(image)) { @@ -177,15 +178,15 @@ class ValidateTheme extends DesugaringStep { if (json["units"] !== undefined) { errors.push( "The theme " + - json.id + - " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) " + json.id + + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) " ) } if (json["roamingRenderings"] !== undefined) { errors.push( "Theme " + - json.id + - " contains an old 'roamingRenderings'. Use an 'overrideAll' instead" + json.id + + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead" ) } } @@ -197,10 +198,10 @@ class ValidateTheme extends DesugaringStep { for (const remoteImage of remoteImages) { errors.push( "Found a remote image: " + - remoteImage + - " in theme " + - json.id + - ", please download it." + remoteImage + + " in theme " + + json.id + + ", please download it." ) } for (const image of images) { @@ -227,12 +228,12 @@ class ValidateTheme extends DesugaringStep { if (theme.id !== filename) { errors.push( "Theme ids should be the same as the name.json, but we got id: " + - theme.id + - " and filename " + - filename + - " (" + - this._path + - ")" + theme.id + + " and filename " + + filename + + " (" + + this._path + + ")" ) } this._validateImage.convertJoin( @@ -312,7 +313,7 @@ class OverrideShadowingCheck extends DesugaringStep { ): { result: LayoutConfigJson; errors?: string[]; warnings?: string[] } { const overrideAll = json.overrideAll if (overrideAll === undefined) { - return { result: json } + return {result: json} } const errors = [] @@ -339,7 +340,7 @@ class OverrideShadowingCheck extends DesugaringStep { } } - return { result: json, errors } + return {result: json, errors} } } @@ -383,6 +384,51 @@ export class PrevalidateTheme extends Fuse { } } +export class DetectConflictingAddExtraTags extends DesugaringStep { + constructor() { + super("The `if`-part in a mapping might set some keys. Those key are not allowed to be set in the `addExtraTags`, as this might result in conflicting values", [], "DetectConflictingAddExtraTags"); + } + + convert(json: TagRenderingConfigJson, context: string): { + result: TagRenderingConfigJson; + errors?: string[]; + warnings?: string[]; + information?: string[] + } { + + if (!(json.mappings?.length > 0)) { + return {result: json} + } + + const tagRendering = new TagRenderingConfig(json) + + const errors = [] + for (let i = 0; i < tagRendering.mappings.length; i++) { + const mapping = tagRendering.mappings[i]; + if (!mapping.addExtraTags) { + continue + } + const keysInMapping = new Set(mapping.if.usedKeys()) + + const keysInAddExtraTags = mapping.addExtraTags.map(t => t.key) + + const duplicateKeys = keysInAddExtraTags.filter(k => keysInMapping.has(k)) + if (duplicateKeys.length > 0) { + errors.push( + "At " + context + ".mappings[" + i + "]: AddExtraTags overrides a key that is set in the `if`-clause of this mapping. Selecting this answer might thus first set one value (needed to match as answer) and then override it with a different value, resulting in an unsaveable question. The offending `addExtraTags` is " + duplicateKeys.join(", ") + ) + } + } + + + return { + result: json, + errors + }; + } +} + + export class DetectShadowedMappings extends DesugaringStep { private readonly _calculatedTagNames: string[] @@ -449,7 +495,7 @@ export class DetectShadowedMappings extends DesugaringStep { + keyValues.forEach(({k, v}) => { properties[k] = v }) for (let j = 0; j < i; j++) { @@ -492,10 +538,10 @@ export class DetectShadowedMappings extends DesugaringStep { if (json["special"] !== undefined) { errors.push( "At " + - context + - ': detected `special` on the top level. Did you mean `{"render":{ "special": ... }}`' + context + + ': detected `special` on the top level. Did you mean `{"render":{ "special": ... }}`' ) } if (json["group"]) { errors.push( "At " + - context + - ': groups are deprecated, use `"label": ["' + - json["group"] + - '"]` instead' + context + + ': groups are deprecated, use `"label": ["' + + json["group"] + + '"]` instead' ) } const freeformType = json["freeform"]?.["type"] @@ -669,6 +715,7 @@ export class ValidateTagRenderings extends Fuse { super( "Various validation on tagRenderingConfigs", new DetectShadowedMappings(layerConfig), + new DetectConflictingAddExtraTags(), new DetectMappingsWithImages(doesImageExist), new MiscTagRenderingChecks(options) ) @@ -711,9 +758,9 @@ export class ValidateLayer extends DesugaringStep { if (!Constants.priviliged_layers.find((x) => x == json.id)) { errors.push( context + - ": layer " + - json.id + - " uses 'special' as source.osmTags. However, this layer is not a priviliged layer" + ": layer " + + json.id + + " uses 'special' as source.osmTags. However, this layer is not a priviliged layer" ) } } @@ -722,13 +769,13 @@ export class ValidateLayer extends DesugaringStep { if (json.title === undefined && json.source !== "special:library") { errors.push( context + - ": this layer does not have a title defined but it does have tagRenderings. Not having a title will disable the popups, resulting in an unclickable element. Please add a title. If not having a popup is intended and the tagrenderings need to be kept (e.g. in a library layer), set `title: null` to disable this error." + ": this layer does not have a title defined but it does have tagRenderings. Not having a title will disable the popups, resulting in an unclickable element. Please add a title. If not having a popup is intended and the tagrenderings need to be kept (e.g. in a library layer), set `title: null` to disable this error." ) } if (json.title === null) { information.push( context + - ": title is `null`. This results in an element that cannot be clicked - even though tagRenderings is set." + ": title is `null`. This results in an element that cannot be clicked - even though tagRenderings is set." ) } } @@ -755,9 +802,9 @@ export class ValidateLayer extends DesugaringStep { console.log(json.tagRenderings) errors.push( "At " + - context + - ": some tagrenderings have a duplicate id: " + - duplicates.join(", ") + context + + ": some tagrenderings have a duplicate id: " + + duplicates.join(", ") ) } } @@ -775,8 +822,8 @@ export class ValidateLayer extends DesugaringStep { if (json["overpassTags"] !== undefined) { errors.push( "Layer " + - json.id + - 'still uses the old \'overpassTags\'-format. Please use "source": {"osmTags": }\' instead of "overpassTags": (note: this isn\'t your fault, the custom theme generator still spits out the old format)' + json.id + + 'still uses the old \'overpassTags\'-format. Please use "source": {"osmTags": }\' instead of "overpassTags": (note: this isn\'t your fault, the custom theme generator still spits out the old format)' ) } const forbiddenTopLevel = [ @@ -794,18 +841,18 @@ export class ValidateLayer extends DesugaringStep { if (json[forbiddenKey] !== undefined) errors.push( context + - ": layer " + - json.id + - " still has a forbidden key " + - forbiddenKey + ": layer " + + json.id + + " still has a forbidden key " + + forbiddenKey ) } if (json["hideUnderlayingFeaturesMinPercentage"] !== undefined) { errors.push( context + - ": layer " + - json.id + - " contains an old 'hideUnderlayingFeaturesMinPercentage'" + ": layer " + + json.id + + " contains an old 'hideUnderlayingFeaturesMinPercentage'" ) } @@ -822,9 +869,9 @@ export class ValidateLayer extends DesugaringStep { if (this._path != undefined && this._path.indexOf(expected) < 0) { errors.push( "Layer is in an incorrect place. The path is " + - this._path + - ", but expected " + - expected + this._path + + ", but expected " + + expected ) } } @@ -865,6 +912,13 @@ export class ValidateLayer extends DesugaringStep { } } + if (json.filter) { + const r = new On("filter", new Each( new ValidateFilter())).convert(json, context) + warnings.push(...(r.warnings ?? [])) + errors.push(...(r.errors ?? [])) + information.push(...(r.information ?? [])) + } + if (json.tagRenderings !== undefined) { const r = new On( "tagRenderings", @@ -886,9 +940,9 @@ export class ValidateLayer extends DesugaringStep { if (hasCondition?.length > 0) { errors.push( "At " + - context + - ":\n One or more icons in the mapRenderings have a condition set. Don't do this, as this will result in an invisible but clickable element. Use extra filters in the source instead. The offending mapRenderings are:\n" + - JSON.stringify(hasCondition, null, " ") + context + + ":\n One or more icons in the mapRenderings have a condition set. Don't do this, as this will result in an invisible but clickable element. Use extra filters in the source instead. The offending mapRenderings are:\n" + + JSON.stringify(hasCondition, null, " ") ) } } @@ -903,7 +957,7 @@ export class ValidateLayer extends DesugaringStep { const preset = json.presets[i] const tags: { k: string; v: string }[] = new And( preset.tags.map((t) => TagUtils.Tag(t)) - ).asChange({ id: "node/-1" }) + ).asChange({id: "node/-1"}) const properties = {} for (const tag of tags) { properties[tag.k] = tag.v @@ -912,12 +966,12 @@ export class ValidateLayer extends DesugaringStep { if (!doMatch) { errors.push( context + - ".presets[" + - i + - "]: This preset does not match the required tags of this layer. This implies that a newly added point will not show up.\n A newly created point will have properties: " + - JSON.stringify(properties) + - "\n The required tags are: " + - baseTags.asHumanString(false, false, {}) + ".presets[" + + i + + "]: This preset does not match the required tags of this layer. This implies that a newly added point will not show up.\n A newly created point will have properties: " + + JSON.stringify(properties) + + "\n The required tags are: " + + baseTags.asHumanString(false, false, {}) ) } } @@ -949,9 +1003,14 @@ export class ValidateFilter extends DesugaringStep { warnings?: string[] information?: string[] } { + if (typeof filter === "string") { + // Calling another filter, we skip + return {result: filter} + } const errors = [] for (const option of filter.options) { - for (let i = 0; i < option.fields.length; i++) { + + for (let i = 0; i < option.fields?.length ?? 0; i++) { const field = option.fields[i] const type = field.type ?? "string" if (Validators.availableTypes.find((t) => t === type) === undefined) { @@ -962,7 +1021,7 @@ export class ValidateFilter extends DesugaringStep { } } } - return { result: filter, errors } + return {result: filter, errors} } } @@ -991,7 +1050,7 @@ export class DetectDuplicateFilters extends DesugaringStep<{ const warnings: string[] = [] const information: string[] = [] - const { layers, themes } = json + const {layers, themes} = json const perOsmTag = new Map< string, { @@ -1027,7 +1086,7 @@ export class DetectDuplicateFilters extends DesugaringStep<{ return } let msg = "Possible duplicate filter: " + key - for (const { filter, layer, layout } of value) { + for (const {filter, layer, layout} of value) { let id = "" if (layout !== undefined) { id = layout.id + ":" From 3c08c1297423d74348aa83e5932a7fbd94c260e5 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 28 Jul 2023 14:34:40 +0200 Subject: [PATCH 042/134] Fix: fix #1528: from weblate to theme files did not properly sync --- scripts/generateTranslations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts index 21460c6b5..0e8a3036d 100644 --- a/scripts/generateTranslations.ts +++ b/scripts/generateTranslations.ts @@ -557,7 +557,7 @@ function MergeTranslation(source: any, target: any, language: string, context: s if (context.endsWith(".tagRenderings")) { keyRemapping = new Map() for (const key in target) { - keyRemapping.set(target[key].id, key) + keyRemapping.set(target[key].id ?? target[key].builtin, key) } } From 2594e75535f61136cbb8cc111446f960c58ac7fc Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 29 Jul 2023 21:53:09 +0200 Subject: [PATCH 043/134] Update food.json: add filter per category --- assets/layers/food/food.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 84df6f908..891318d41 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -961,6 +961,33 @@ } ] }, + + { + "id": "food-category", + "options": [ + { + "question": { + "en": "All categories" + }}, + + + + { + "question": { + "en"; "Only fastfood buisinesses" + }, + "osmTags": "amenity=fast_food" } + +{ + "question": { + "en": "Only restaurants" + }, + "osmTags": "amenity=restaurant" } + + + ] + }, + { "id": "vegetarian", "options": [ From 366577f70b40765b3e10ccae222193ca07cae4bb Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 30 Jul 2023 04:56:10 +0200 Subject: [PATCH 044/134] Fix: typo in filter --- assets/layers/food/food.json | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 891318d41..087051127 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -961,33 +961,28 @@ } ] }, - { "id": "food-category", "options": [ { "question": { "en": "All categories" - }}, - - - + } + }, { "question": { - "en"; "Only fastfood buisinesses" - }, - "osmTags": "amenity=fast_food" } - -{ + "en": "Only fastfood buisinesses" + }, + "osmTags": "amenity=fast_food" + }, + { "question": { "en": "Only restaurants" - }, - "osmTags": "amenity=restaurant" } - - + }, + "osmTags": "amenity=restaurant" + } ] }, - { "id": "vegetarian", "options": [ From 565b9f0bb55faf99e1e36cc713d3984bb5da591e Mon Sep 17 00:00:00 2001 From: pelderson <38458314+pelderson@users.noreply.github.com> Date: Tue, 1 Aug 2023 17:33:31 +0200 Subject: [PATCH 045/134] Update waste_disposal.json iconsize verkleind naar 20,20 en minzoom opgehoogd naar 14 --- assets/layers/waste_disposal/waste_disposal.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index 0bf07f886..cdc6324a5 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -39,7 +39,8 @@ "point", "centroid" ], - "icon": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg" + "icon": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg", + "iconSize": "20,20" } ], "presets": [ From 5d00f3cc6a75a22732ec7ffa63d9335d9d75853c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Aug 2023 20:41:18 +0200 Subject: [PATCH 046/134] Fix: fix #1532 --- src/Models/ThemeConfig/TagRenderingConfig.ts | 82 ++++++++++++-------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts index dbc0ba2f3..6cd5dc4dc 100644 --- a/src/Models/ThemeConfig/TagRenderingConfig.ts +++ b/src/Models/ThemeConfig/TagRenderingConfig.ts @@ -58,7 +58,7 @@ export default class TagRenderingConfig { public readonly freeform?: { readonly key: string - readonly type: string + readonly type: ValidatorType readonly placeholder: Translation readonly addExtraTags: UploadableTag[] readonly inline: boolean @@ -133,7 +133,17 @@ export default class TagRenderingConfig { ) { throw `Freeform.addExtraTags should be a list of strings - not a single string (at ${context})` } - const type = json.freeform.type ?? "string" + if ( + json.freeform.type && + Validators.availableTypes.indexOf(json.freeform.type) < 0 + ) { + throw `At ${context}: invalid type, perhaps you meant ${Utils.sortedByLevenshteinDistance( + json.freeform.key, + Validators.availableTypes, + (s) => s + )}` + } + const type: ValidatorType = json.freeform.type ?? "string" let placeholder: Translation = Translations.T(json.freeform.placeholder) if (placeholder === undefined) { @@ -622,7 +632,7 @@ export default class TagRenderingConfig { * * @param singleSelectedMapping (Only used if multiAnswer == false): the single mapping to apply. Use (mappings.length) for the freeform * @param multiSelectedMapping (Only used if multiAnswer == true): all the mappings that must be applied. Set multiSelectedMapping[mappings.length] to use the freeform as well - * @param currentProperties: The current properties of the object for which the question should be answered + * @param currentProperties The current properties of the object for which the question should be answered */ public constructChangeSpecification( freeformValue: string | undefined, @@ -685,38 +695,42 @@ export default class TagRenderingConfig { return undefined } return and - } else { - // Is at least one mapping shown in the answer? - const someMappingIsShown = this.mappings.some((m) => { - if (typeof m.hideInAnswer === "boolean") { - return !m.hideInAnswer - } - const isHidden = m.hideInAnswer.matchesProperties(currentProperties) - return !isHidden - }) - // If all mappings are hidden for the current tags, we can safely assume that we should use the freeform key - const useFreeform = - freeformValue !== undefined && - (singleSelectedMapping === this.mappings.length || !someMappingIsShown) - if (useFreeform) { - return new And([ - new Tag(this.freeform.key, freeformValue), - ...(this.freeform.addExtraTags ?? []), - ]) - } else if (singleSelectedMapping !== undefined) { - return new And([ - this.mappings[singleSelectedMapping].if, - ...(this.mappings[singleSelectedMapping].addExtraTags ?? []), - ]) - } else { - console.warn("TagRenderingConfig.ConstructSpecification has a weird fallback for", { - freeformValue, - singleSelectedMapping, - multiSelectedMapping, - currentProperties, - }) - return undefined + } + + // Is at least one mapping shown in the answer? + const someMappingIsShown = this.mappings.some((m) => { + if (typeof m.hideInAnswer === "boolean") { + return !m.hideInAnswer } + const isHidden = m.hideInAnswer.matchesProperties(currentProperties) + return !isHidden + }) + // If all mappings are hidden for the current tags, we can safely assume that we should use the freeform key + const useFreeform = + freeformValue !== undefined && + (singleSelectedMapping === this.mappings.length || + !someMappingIsShown || + singleSelectedMapping === undefined) + if (useFreeform) { + return new And([ + new Tag(this.freeform.key, freeformValue), + ...(this.freeform.addExtraTags ?? []), + ]) + } else if (singleSelectedMapping !== undefined) { + return new And([ + this.mappings[singleSelectedMapping].if, + ...(this.mappings[singleSelectedMapping].addExtraTags ?? []), + ]) + } else { + console.error("TagRenderingConfig.ConstructSpecification has a weird fallback for", { + freeformValue, + singleSelectedMapping, + multiSelectedMapping, + currentProperties, + useFreeform, + }) + + return undefined } } From 7d5aa725fb319b14cc82f54a35c2601274773d43 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Aug 2023 20:44:34 +0200 Subject: [PATCH 047/134] Typing: Fix some typing errors --- .../mapcomplete-changes.json | 97 +++++-------------- src/UI/InputElement/ValidatedInput.svelte | 3 +- src/UI/InputElement/Validator.ts | 10 +- .../InputElement/Validators/FloatValidator.ts | 5 +- .../TagRendering/TagRenderingQuestion.svelte | 2 +- 5 files changed, 37 insertions(+), 80 deletions(-) diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index deda66b65..56555e871 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "nl": "Toon wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -26,9 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "nl": "Centerpunt van changeset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -39,51 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung gemacht von {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -92,27 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Sprache wurde diese Änderung vorgenommen?", - "nl": "In welke locale (taal) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Usersprache ist {locale}", - "nl": "De gebruikerstaal is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "de": "Änderung vorgenommen mit {host}", - "nl": "Wijziging gemaakt met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -133,12 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -480,9 +452,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themenaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -498,9 +468,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -516,9 +484,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -535,9 +501,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -554,9 +518,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -572,9 +534,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "nl": "De taal van de bijdrager is {search}" + "en": "User language (iso-code) {search}" } } ] @@ -590,9 +550,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -603,9 +561,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Changeset fügte mindestens ein Bild hinzu", - "nl": "Changeset bevat minstens één afbeelding" + "en": "Changeset added at least one image" } } ] @@ -620,8 +576,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier" + "en": "More statistics can be found here" } }, { diff --git a/src/UI/InputElement/ValidatedInput.svelte b/src/UI/InputElement/ValidatedInput.svelte index 3656e819f..57b702e1d 100644 --- a/src/UI/InputElement/ValidatedInput.svelte +++ b/src/UI/InputElement/ValidatedInput.svelte @@ -9,7 +9,7 @@ import { Unit } from "../../Models/Unit" import UnitInput from "../Popup/UnitInput.svelte" - export let type: ValidatorType + export let type: ValidatorType export let feedback: UIEventSource | undefined = undefined export let getCountry: () => string | undefined export let placeholder: string | Translation | undefined @@ -63,6 +63,7 @@ } if (unit && isNaN(Number(v))) { + console.debug("Not a number, but a unit is required") value.setData(undefined) return } diff --git a/src/UI/InputElement/Validator.ts b/src/UI/InputElement/Validator.ts index 5172b2433..e63a98f94 100644 --- a/src/UI/InputElement/Validator.ts +++ b/src/UI/InputElement/Validator.ts @@ -1,6 +1,6 @@ -import BaseUIElement from "../BaseUIElement" -import { Translation } from "../i18n/Translation" -import Translations from "../i18n/Translations" +import BaseUIElement from "../BaseUIElement"; +import { Translation } from "../i18n/Translation"; +import Translations from "../i18n/Translations"; /** * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback. @@ -16,13 +16,13 @@ export abstract class Validator { /** * What HTML-inputmode to use */ - public readonly inputmode?: string + public readonly inputmode?: 'none' | 'text' | 'tel' | 'url' | 'email' | 'numeric' | 'decimal' | 'search' public readonly textArea: boolean constructor( name: string, explanation: string | BaseUIElement, - inputmode?: string, + inputmode?: 'none' | 'text' | 'tel' | 'url' | 'email' | 'numeric' | 'decimal' | 'search', textArea?: false | boolean ) { this.name = name diff --git a/src/UI/InputElement/Validators/FloatValidator.ts b/src/UI/InputElement/Validators/FloatValidator.ts index f984a9fc0..2c3f6adbb 100644 --- a/src/UI/InputElement/Validators/FloatValidator.ts +++ b/src/UI/InputElement/Validators/FloatValidator.ts @@ -1,11 +1,12 @@ import { Translation } from "../../i18n/Translation" import Translations from "../../i18n/Translations" import { Validator } from "../Validator" +import { ValidatorType } from "../Validators"; export default class FloatValidator extends Validator { - inputmode = "decimal" + inputmode: "decimal" = "decimal" - constructor(name?: string, explanation?: string) { + constructor(name?: ValidatorType, explanation?: string) { super(name ?? "float", explanation ?? "A decimal number", "decimal") } diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte index a746aba3d..0454187e3 100644 --- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte +++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte @@ -69,7 +69,7 @@ export let selectedTags: TagsFilter = undefined let mappings: Mapping[] = config?.mappings - let searchTerm: Store = new UIEventSource("") + let searchTerm: UIEventSource = new UIEventSource("") $: { try { From 1b8970b34aae337edfe5567315cc36319add1ff7 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Aug 2023 20:46:40 +0200 Subject: [PATCH 048/134] Fix: small CSS fix --- src/UI/Popup/DeleteFlow/DeleteWizard.svelte | 45 ++++++++++----------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/UI/Popup/DeleteFlow/DeleteWizard.svelte b/src/UI/Popup/DeleteFlow/DeleteWizard.svelte index 5135b7ff9..9a895f447 100644 --- a/src/UI/Popup/DeleteFlow/DeleteWizard.svelte +++ b/src/UI/Popup/DeleteFlow/DeleteWizard.svelte @@ -1,24 +1,24 @@ {#if $canBeDeleted === false && !hasSoftDeletion} -
- +
- +
{:else} From d05b0b9562275544c463167f11e5f7a0f5930e90 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 9 Aug 2023 14:05:37 +0200 Subject: [PATCH 049/134] Added translation using Weblate (Hebrew) --- langs/layers/he.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 langs/layers/he.json diff --git a/langs/layers/he.json b/langs/layers/he.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/langs/layers/he.json @@ -0,0 +1 @@ +{} From e7709237dba71b0ed65cedab7c8326a19dd3392b Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:06:20 +0200 Subject: [PATCH 050/134] Added translation using Weblate (Hebrew (Israel)) --- langs/layers/he_IL.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 langs/layers/he_IL.json diff --git a/langs/layers/he_IL.json b/langs/layers/he_IL.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/langs/layers/he_IL.json @@ -0,0 +1 @@ +{} From 37dc6a71616fc9510d1bf6e814060390dd329629 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:16:17 +0200 Subject: [PATCH 051/134] Fix: correctly interpret 'hideInAnswer'-conditions, recalculate them dynamically --- src/UI/Popup/TagRendering/TagRenderingQuestion.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte index a746aba3d..b8bd989e0 100644 --- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte +++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte @@ -38,11 +38,12 @@ let selectedMapping: number = undefined let checkedMappings: boolean[] $: { + let tgs = $tags mappings = config.mappings?.filter((m) => { if (typeof m.hideInAnswer === "boolean") { return !m.hideInAnswer } - return m.hideInAnswer.matchesProperties(tags.data) + return !m.hideInAnswer.matchesProperties(tgs) }) // We received a new config -> reinit unit = layer.units.find((unit) => unit.appliesToKeys.has(config.freeform?.key)) @@ -59,7 +60,7 @@ if (config.freeform?.key) { if (!config.multiAnswer) { // Somehow, setting multianswer freeform values is broken if this is not set - freeformInput.setData(tags.data[config.freeform.key]) + freeformInput.setData(tgs[config.freeform.key]) } } else { freeformInput.setData(undefined) From fd9c48b5b56fe7a08e3532cad777246b82b3a073 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:16:48 +0200 Subject: [PATCH 052/134] Fix: add 'maxspeed=20' to living street --- assets/layers/maxspeed/maxspeed.json | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json index 2ec358887..3ee814e94 100644 --- a/assets/layers/maxspeed/maxspeed.json +++ b/assets/layers/maxspeed/maxspeed.json @@ -79,24 +79,6 @@ "type": "pnat" }, "mappings": [ - { - "if": { - "and": [ - "highway=living_street", - "_country!=be" - ] - }, - "then": { - "en": "This is a living street, which has a maxspeed of 20km/h", - "de": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt", - "nl": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" - }, - "icon": { - "path": "./assets/layers/maxspeed/living_street_be.svg", - "class": "large" - }, - "hideInAnswer": true - }, { "if": "highway=living_street", "then": { @@ -108,6 +90,7 @@ "path": "./assets/layers/maxspeed/living_street_be.svg", "class": "large" }, + "addExtraTags": ["maxspeed=20"], "hideInAnswer": "_country!=be" } ], From 4602df30469b57a57b9b8e1b8c6cc5c70ff901d7 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:18:06 +0200 Subject: [PATCH 053/134] Fix: add safety check to not overuse the OSM-api --- src/Logic/FeatureSource/Sources/OsmFeatureSource.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Logic/FeatureSource/Sources/OsmFeatureSource.ts b/src/Logic/FeatureSource/Sources/OsmFeatureSource.ts index 31616f439..1475744e9 100644 --- a/src/Logic/FeatureSource/Sources/OsmFeatureSource.ts +++ b/src/Logic/FeatureSource/Sources/OsmFeatureSource.ts @@ -72,6 +72,11 @@ export default class OsmFeatureSource extends FeatureSourceMerger { return } + if (neededTiles.total > 100) { + console.error("Too much tiles to download!") + return + } + this.isRunning.setData(true) try { const tileNumbers = Tiles.MapRange(neededTiles, (x, y) => { @@ -133,7 +138,6 @@ export default class OsmFeatureSource extends FeatureSourceMerger { } private async LoadTile(z: number, x: number, y: number): Promise { - console.log("OsmFeatureSource: loading ", z, x, y, "from", this._backend) if (z >= 22) { throw "This is an absurd high zoom level" } @@ -145,6 +149,7 @@ export default class OsmFeatureSource extends FeatureSourceMerger { if (this._downloadedTiles.has(index)) { return } + console.log("OsmFeatureSource: loading ", z, x, y, "from", this._backend) this._downloadedTiles.add(index) const bbox = BBox.fromTile(z, x, y) From c2628cb5e7ca4443b1de56464ac270dd76b62803 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:18:31 +0200 Subject: [PATCH 054/134] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18f75eed6..07948e4e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapcomplete", - "version": "0.31.2", + "version": "0.31.3", "repository": "https://github.com/pietervdvn/MapComplete", "description": "A small website to edit OSM easily", "bugs": "https://github.com/pietervdvn/MapComplete/issues", From c1a25af54da0e11d0998ad56b0dec4af40008a76 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 9 Aug 2023 18:26:06 +0200 Subject: [PATCH 055/134] Add check_date, payment, allow move and delete --- assets/layers/questions/questions.json | 27 +++++++++++++++++++ .../themes/elongated_coin/elongated_coin.json | 23 +++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 3774c0a91..678b0b402 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -2174,6 +2174,33 @@ } } ] + }, + { + "id": "check_date", + "question": { + "en": "When was this object last checked?", + "de": "Wann wurde dieses Objekt zuletzt kontrolliert?", + "nl": "Wanneer is dit object voor het laatst gecontroleerd?" + }, + "freeform": { + "key": "check_date", + "type": "date" + }, + "render": { + "en": "This object was last checked on {check_date}", + "de": "Dieses Objekt wurde zuletzt kontrolliert am {check_date}", + "nl": "Dit object is voor het laatst gecontroleerd op {check_date}" + }, + "mappings": [ + { + "if": "check_date:={_now:date}", + "then": { + "en": "This object was last checked today", + "de": "Dieses Objekt wurde heute zuletzt kontrolliert", + "nl": "Dit object is vandaag voor het laatst gecontroleerd" + } + } + ] } ] } \ No newline at end of file diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json index 627ce25b4..d1a97f492 100644 --- a/assets/themes/elongated_coin/elongated_coin.json +++ b/assets/themes/elongated_coin/elongated_coin.json @@ -86,6 +86,21 @@ } ] }, + { + "id": "payment", + "builtin": "payment-options-split", + "override": { + "mappings": [ + {}, + {}, + {}, + {}, + { + "hideInAnswer": true + } + ] + } + }, { "id": "coin", "question": { @@ -205,7 +220,8 @@ } ] }, - "level" + "level", + "check_date" ], "mapRendering": [ { @@ -235,6 +251,11 @@ ] } ], + "allowMove": { + "enableImproveAccuracy": true, + "enableRelocation": true + }, + "deletion": true, "filter": [ "open_now" ] From 8485a4af036945022317f791d4077c75d85859b7 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 9 Aug 2023 19:41:23 +0200 Subject: [PATCH 056/134] Add filters, remove override --- assets/layers/filters/filters.json | 22 +++++++++++++++++++ .../themes/elongated_coin/elongated_coin.json | 20 ++++------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index 4b1f6edad..1f9abce81 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -55,6 +55,28 @@ } ] }, + { + "id": "accepts_debit_cards", + "options": [ + { + "osmTags": "payment:debit_cards=yes", + "question": { + "en": "Accepts debit cards" + } + } + ] + }, + { + "id": "accepts_credit_cards", + "options": [ + { + "osmTags": "payment:credit_cards=yes", + "question": { + "en": "Accepts credit cards" + } + } + ] + }, { "id": "has_image", "options": [ diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json index d1a97f492..9ad55da16 100644 --- a/assets/themes/elongated_coin/elongated_coin.json +++ b/assets/themes/elongated_coin/elongated_coin.json @@ -86,21 +86,7 @@ } ] }, - { - "id": "payment", - "builtin": "payment-options-split", - "override": { - "mappings": [ - {}, - {}, - {}, - {}, - { - "hideInAnswer": true - } - ] - } - }, + "payment-options-split", { "id": "coin", "question": { @@ -257,7 +243,9 @@ }, "deletion": true, "filter": [ - "open_now" + "open_now", + "accepts_debit_cards", + "accepts_credit_cards" ] } ], From 03aafbe99c0d9f4fa5768d18e7bde093529ce93f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 10 Aug 2023 14:10:06 +0200 Subject: [PATCH 057/134] Themes: add possibility to add an icon to 'render' (just like with mappings), add contact:mastodon support as general question, add mastodon question to hackerspaces --- assets/layers/hackerspace/hackerspace.json | 1 + assets/layers/questions/questions.json | 27 +++- langs/en.json | 5 + .../Json/TagRenderingConfigJson.ts | 20 +++ src/Models/ThemeConfig/TagRenderingConfig.ts | 64 +++++--- src/UI/InputElement/Validators.ts | 3 + .../Validators/FediverseValidator.ts | 63 ++++++++ src/UI/SpecialVisualizations.ts | 153 ++++++++++-------- 8 files changed, 237 insertions(+), 99 deletions(-) create mode 100644 src/UI/InputElement/Validators/FediverseValidator.ts diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index 8ebf9bf87..2beb640e2 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -112,6 +112,7 @@ "website", "email", "phone", + "mastodon", { "builtin": "opening_hours_24_7", "override": { diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 678b0b402..c3412b52d 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -173,11 +173,13 @@ "render": { "*": "{phone}" }, + "icon": "./assets/layers/questions/phone.svg", "mappings": [ { "if": "contact:phone~*", "then": "{contact:phone}", - "hideInAnswer": true + "hideInAnswer": true, + "icon": "./assets/layers/questions/phone.svg" } ], "freeform": { @@ -188,6 +190,21 @@ ] } }, + { + "id": "mastodon", + "description": "Shows and asks for the mastodon handle", + "question": { + "en": "What is the Mastodon-handle of {title()}?" + }, + "freeform": { + "key": "contact:mastodon", + "type": "fediverse" + }, + "render": { + "*": "{fediverse_link(contact:mastodon)}" + }, + "icon": "./assets/svg/mastodon.svg" + }, { "id": "osmlink", "render": { @@ -205,6 +222,7 @@ "render": { "*": "{email}" }, + "icon": "./assets/svg/envelope.svg", "labels": [ "contact" ], @@ -236,6 +254,7 @@ "mappings": [ { "if": "contact:email~*", + "icon": "./assets/svg/envelope.svg", "then": "{contact:email}", "hideInAnswer": true } @@ -253,6 +272,7 @@ "labels": [ "contact" ], + "icon": "./assets/layers/icons/website.svg", "question": { "en": "What is the website of {title()}?", "nl": "Wat is de website van {title()}?", @@ -292,7 +312,8 @@ { "if": "contact:website~*", "then": "{contact:website}", - "hideInAnswer": true + "hideInAnswer": true, + "icon": "./assets/layers/icons/website.svg" } ] }, @@ -2203,4 +2224,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/langs/en.json b/langs/en.json index 62a481843..24f6953cf 100644 --- a/langs/en.json +++ b/langs/en.json @@ -610,6 +610,11 @@ "feedback": "This is not a valid email address", "noAt": "An e-mail address must contain an @" }, + "fediverse": { + "description": "A fediverse handle, often @username@server.tld", + "feedback": "A fediverse handle consists of @username@server.tld or is a link to a profile", + "invalidHost": "{host} is not a valid hostname" + }, "float": { "description": "a number", "feedback": "This is not a number" diff --git a/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts b/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts index 583294f3d..56bfd7876 100644 --- a/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts +++ b/src/Models/ThemeConfig/Json/TagRenderingConfigJson.ts @@ -41,6 +41,26 @@ export interface TagRenderingConfigJson { | Record | { special: Record> & { type: string } } + /** + * An icon shown next to the rendering; typically shown pretty small + * This is only shown next to the "render" value + * Type: icon + */ + icon?: + | string + | { + /** + * The path to the icon + * Type: icon + */ + path: string + /** + * A hint to mapcomplete on how to render this icon within the mapping. + * This is translated to 'mapping-icon-', so defining your own in combination with a custom CSS is possible (but discouraged) + */ + class?: "small" | "medium" | "large" | string + } + /** * Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`. * diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts index 6cd5dc4dc..940056a99 100644 --- a/src/Models/ThemeConfig/TagRenderingConfig.ts +++ b/src/Models/ThemeConfig/TagRenderingConfig.ts @@ -1,23 +1,24 @@ -import { Translation, TypedTranslation } from "../../UI/i18n/Translation" -import { TagsFilter } from "../../Logic/Tags/TagsFilter" +import {Translation, TypedTranslation} from "../../UI/i18n/Translation" +import {TagsFilter} from "../../Logic/Tags/TagsFilter" import Translations from "../../UI/i18n/Translations" -import { TagUtils, UploadableTag } from "../../Logic/Tags/TagUtils" -import { And } from "../../Logic/Tags/And" -import { Utils } from "../../Utils" -import { Tag } from "../../Logic/Tags/Tag" +import {TagUtils, UploadableTag} from "../../Logic/Tags/TagUtils" +import {And} from "../../Logic/Tags/And" +import {Utils} from "../../Utils" +import {Tag} from "../../Logic/Tags/Tag" import BaseUIElement from "../../UI/BaseUIElement" import Combine from "../../UI/Base/Combine" import Title from "../../UI/Base/Title" import Link from "../../UI/Base/Link" import List from "../../UI/Base/List" -import { - MappingConfigJson, - QuestionableTagRenderingConfigJson, -} from "./Json/QuestionableTagRenderingConfigJson" -import { FixedUiElement } from "../../UI/Base/FixedUiElement" -import { Paragraph } from "../../UI/Base/Paragraph" +import {MappingConfigJson, QuestionableTagRenderingConfigJson,} from "./Json/QuestionableTagRenderingConfigJson" +import {FixedUiElement} from "../../UI/Base/FixedUiElement" +import {Paragraph} from "../../UI/Base/Paragraph" import Svg from "../../Svg" -import Validators, { ValidatorType } from "../../UI/InputElement/Validators" +import Validators, {ValidatorType} from "../../UI/InputElement/Validators" + +export interface Icon { + +} export interface Mapping { readonly if: UploadableTag @@ -45,6 +46,8 @@ export interface Mapping { export default class TagRenderingConfig { public readonly id: string public readonly render?: TypedTranslation + public readonly renderIcon?: string + public readonly renderIconClass?: string public readonly question?: TypedTranslation public readonly questionhint?: TypedTranslation public readonly condition?: TagsFilter @@ -121,9 +124,16 @@ export default class TagRenderingConfig { this.question = Translations.T(json.question, translationKey + ".question") this.questionhint = Translations.T(json.questionHint, translationKey + ".questionHint") this.description = Translations.T(json.description, translationKey + ".description") - this.condition = TagUtils.Tag(json.condition ?? { and: [] }, `${context}.condition`) + this.condition = TagUtils.Tag(json.condition ?? {and: []}, `${context}.condition`) + if (typeof json.icon === "string") { + this.renderIcon = json.icon + this.renderIconClass = "small" + }else if (typeof json.icon === "object"){ + this.renderIcon = json.icon.path + this.renderIconClass = json.icon.class + } this.metacondition = TagUtils.Tag( - json.metacondition ?? { and: [] }, + json.metacondition ?? {and: []}, `${context}.metacondition` ) if (json.freeform) { @@ -238,15 +248,17 @@ export default class TagRenderingConfig { if (txt.indexOf("{" + this.freeform.key + ":") >= 0) { continue } - if (txt.indexOf("{canonical(" + this.freeform.key + ")") >= 0) { - continue - } + if ( this.freeform.type === "opening_hours" && txt.indexOf("{opening_hours_table(") >= 0 ) { continue } + const keyFirstArg = ["canonical", "fediverse_link"] + if (keyFirstArg.some(funcName => txt.indexOf(`{${funcName}(${this.freeform.key}`) >= 0)) { + continue + } if ( this.freeform.type === "wikidata" && txt.indexOf("{wikipedia(" + this.freeform.key) >= 0 @@ -532,7 +544,7 @@ export default class TagRenderingConfig { */ public GetRenderValueWithImage( tags: Record - ): { then: TypedTranslation; icon?: string } | undefined { + ): { then: TypedTranslation; icon?: string, iconClass?: string } | undefined { if (this.condition !== undefined) { if (!this.condition.matchesProperties(tags)) { return undefined @@ -551,7 +563,7 @@ export default class TagRenderingConfig { } if (this.freeform?.key === undefined || tags[this.freeform.key] !== undefined) { - return { then: this.render } + return {then: this.render, icon: this.renderIcon, iconClass: this.renderIconClass} } return undefined @@ -773,7 +785,7 @@ export default class TagRenderingConfig { if (m.ifnot !== undefined) { msgs.push( "Unselecting this answer will add " + - m.ifnot.asHumanString(true, false, {}) + m.ifnot.asHumanString(true, false, {}) ) } return msgs @@ -803,12 +815,12 @@ export default class TagRenderingConfig { this.description, this.question !== undefined ? new Combine([ - "The question is ", - new FixedUiElement(this.question.txt).SetClass("font-bold bold"), - ]) + "The question is ", + new FixedUiElement(this.question.txt).SetClass("font-bold bold"), + ]) : new FixedUiElement( - "This tagrendering has no question and is thus read-only" - ).SetClass("italic"), + "This tagrendering has no question and is thus read-only" + ).SetClass("italic"), new Combine(withRender), mappings, condition, diff --git a/src/UI/InputElement/Validators.ts b/src/UI/InputElement/Validators.ts index c340fc355..1e10e8ec3 100644 --- a/src/UI/InputElement/Validators.ts +++ b/src/UI/InputElement/Validators.ts @@ -18,6 +18,7 @@ import ColorValidator from "./Validators/ColorValidator" import BaseUIElement from "../BaseUIElement" import Combine from "../Base/Combine" import Title from "../Base/Title" +import FediverseValidator from "./Validators/FediverseValidator"; export type ValidatorType = (typeof Validators.availableTypes)[number] @@ -39,6 +40,7 @@ export default class Validators { "phone", "opening_hours", "color", + "fediverse" ] as const public static readonly AllValidators: ReadonlyArray = [ @@ -58,6 +60,7 @@ export default class Validators { new PhoneValidator(), new OpeningHoursValidator(), new ColorValidator(), + new FediverseValidator() ] private static _byType = Validators._byTypeConstructor() diff --git a/src/UI/InputElement/Validators/FediverseValidator.ts b/src/UI/InputElement/Validators/FediverseValidator.ts new file mode 100644 index 000000000..f1d5f6682 --- /dev/null +++ b/src/UI/InputElement/Validators/FediverseValidator.ts @@ -0,0 +1,63 @@ +import {Validator} from "../Validator" +import {Translation} from "../../i18n/Translation"; +import Translations from "../../i18n/Translations"; + +export default class FediverseValidator extends Validator { + + public static readonly usernameAtServer: RegExp = /^@?(\w+)@((\w|\.)+)$/ + + constructor() { + super("fediverse", "Validates fediverse addresses and normalizes them into `@username@server`-format"); + } + + /** + * Returns an `@username@host` + * @param s + */ + reformat(s: string): string { + if(!s.startsWith("@")){ + s = "@"+s + } + if (s.match(FediverseValidator.usernameAtServer)) { + return s + } + try { + const url = new URL(s) + const path = url.pathname + if (path.match(/^\/\w+$/)) { + return `@${path.substring(1)}@${url.hostname}`; + } + } catch (e) { + // Nothing to do here + } + return undefined + } +getFeedback(s: string): Translation | undefined { + const match = s.match(FediverseValidator.usernameAtServer) + console.log("Match:", match) + if (match) { + const host = match[2] + try { + const url = new URL("https://" + host) + return undefined + } catch (e) { + return Translations.t.validation.fediverse.invalidHost.Subs({host}) + } + } + try { + const url = new URL(s) + const path = url.pathname + if (path.match(/^\/\w+$/)) { + return undefined + } + } catch (e) { + // Nothing to do here + } + return Translations.t.validation.fediverse.feedback +} + + isValid(s): boolean { + return this.getFeedback(s) === undefined + + } +} diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index 7395c4f14..2c0260c47 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -1,56 +1,52 @@ import Combine from "./Base/Combine" -import { FixedUiElement } from "./Base/FixedUiElement" +import {FixedUiElement} from "./Base/FixedUiElement" import BaseUIElement from "./BaseUIElement" import Title from "./Base/Title" import Table from "./Base/Table" -import { - RenderingSpecification, - SpecialVisualization, - SpecialVisualizationState, -} from "./SpecialVisualization" -import { HistogramViz } from "./Popup/HistogramViz" -import { MinimapViz } from "./Popup/MinimapViz" -import { ShareLinkViz } from "./Popup/ShareLinkViz" -import { UploadToOsmViz } from "./Popup/UploadToOsmViz" -import { MultiApplyViz } from "./Popup/MultiApplyViz" -import { AddNoteCommentViz } from "./Popup/AddNoteCommentViz" -import { PlantNetDetectionViz } from "./Popup/PlantNetDetectionViz" +import {RenderingSpecification, SpecialVisualization, SpecialVisualizationState,} from "./SpecialVisualization" +import {HistogramViz} from "./Popup/HistogramViz" +import {MinimapViz} from "./Popup/MinimapViz" +import {ShareLinkViz} from "./Popup/ShareLinkViz" +import {UploadToOsmViz} from "./Popup/UploadToOsmViz" +import {MultiApplyViz} from "./Popup/MultiApplyViz" +import {AddNoteCommentViz} from "./Popup/AddNoteCommentViz" +import {PlantNetDetectionViz} from "./Popup/PlantNetDetectionViz" import TagApplyButton from "./Popup/TagApplyButton" -import { CloseNoteButton } from "./Popup/CloseNoteButton" -import { MapillaryLinkVis } from "./Popup/MapillaryLinkVis" -import { Store, Stores, UIEventSource } from "../Logic/UIEventSource" +import {CloseNoteButton} from "./Popup/CloseNoteButton" +import {MapillaryLinkVis} from "./Popup/MapillaryLinkVis" +import {Store, Stores, UIEventSource} from "../Logic/UIEventSource" import AllTagsPanel from "./Popup/AllTagsPanel.svelte" import AllImageProviders from "../Logic/ImageProviders/AllImageProviders" -import { ImageCarousel } from "./Image/ImageCarousel" -import { ImageUploadFlow } from "./Image/ImageUploadFlow" -import { VariableUiElement } from "./Base/VariableUIElement" -import { Utils } from "../Utils" -import Wikidata, { WikidataResponse } from "../Logic/Web/Wikidata" -import { Translation } from "./i18n/Translation" +import {ImageCarousel} from "./Image/ImageCarousel" +import {ImageUploadFlow} from "./Image/ImageUploadFlow" +import {VariableUiElement} from "./Base/VariableUIElement" +import {Utils} from "../Utils" +import Wikidata, {WikidataResponse} from "../Logic/Web/Wikidata" +import {Translation} from "./i18n/Translation" import Translations from "./i18n/Translations" import ReviewForm from "./Reviews/ReviewForm" import ReviewElement from "./Reviews/ReviewElement" import OpeningHoursVisualization from "./OpeningHours/OpeningHoursVisualization" import LiveQueryHandler from "../Logic/Web/LiveQueryHandler" -import { SubtleButton } from "./Base/SubtleButton" +import {SubtleButton} from "./Base/SubtleButton" import Svg from "../Svg" import NoteCommentElement from "./Popup/NoteCommentElement" import ImgurUploader from "../Logic/ImageProviders/ImgurUploader" import FileSelectorButton from "./Input/FileSelectorButton" -import { LoginToggle } from "./Popup/LoginButton" +import {LoginToggle} from "./Popup/LoginButton" import Toggle from "./Input/Toggle" -import { SubstitutedTranslation } from "./SubstitutedTranslation" +import {SubstitutedTranslation} from "./SubstitutedTranslation" import List from "./Base/List" import StatisticsPanel from "./BigComponents/StatisticsPanel" import AutoApplyButton from "./Popup/AutoApplyButton" -import { LanguageElement } from "./Popup/LanguageElement" +import {LanguageElement} from "./Popup/LanguageElement" import FeatureReviews from "../Logic/Web/MangroveReviews" import Maproulette from "../Logic/Maproulette" import SvelteUIElement from "./Base/SvelteUIElement" -import { BBoxFeatureSourceForLayer } from "../Logic/FeatureSource/Sources/TouchesBboxFeatureSource" +import {BBoxFeatureSourceForLayer} from "../Logic/FeatureSource/Sources/TouchesBboxFeatureSource" import QuestionViz from "./Popup/QuestionViz" -import { Feature, Point } from "geojson" -import { GeoOperations } from "../Logic/GeoOperations" +import {Feature, Point} from "geojson" +import {GeoOperations} from "../Logic/GeoOperations" import CreateNewNote from "./Popup/CreateNewNote.svelte" import AddNewPoint from "./Popup/AddNewPoint/AddNewPoint.svelte" import UserProfile from "./BigComponents/UserProfile.svelte" @@ -58,30 +54,27 @@ import LanguagePicker from "./LanguagePicker" import Link from "./Base/Link" import LayerConfig from "../Models/ThemeConfig/LayerConfig" import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig" -import NearbyImages, { - NearbyImageOptions, - P4CPicture, - SelectOneNearbyImage, -} from "./Popup/NearbyImages" -import { Tag } from "../Logic/Tags/Tag" +import NearbyImages, {NearbyImageOptions, P4CPicture, SelectOneNearbyImage,} from "./Popup/NearbyImages" +import {Tag} from "../Logic/Tags/Tag" import ChangeTagAction from "../Logic/Osm/Actions/ChangeTagAction" -import { And } from "../Logic/Tags/And" -import { SaveButton } from "./Popup/SaveButton" +import {And} from "../Logic/Tags/And" +import {SaveButton} from "./Popup/SaveButton" import Lazy from "./Base/Lazy" -import { CheckBox } from "./Input/Checkboxes" +import {CheckBox} from "./Input/Checkboxes" import Slider from "./Input/Slider" -import { OsmTags, WayId } from "../Models/OsmFeature" +import {OsmTags, WayId} from "../Models/OsmFeature" import MoveWizard from "./Popup/MoveWizard" import SplitRoadWizard from "./Popup/SplitRoadWizard" -import { ExportAsGpxViz } from "./Popup/ExportAsGpxViz" +import {ExportAsGpxViz} from "./Popup/ExportAsGpxViz" import WikipediaPanel from "./Wikipedia/WikipediaPanel.svelte" import TagRenderingEditable from "./Popup/TagRendering/TagRenderingEditable.svelte" -import { PointImportButtonViz } from "./Popup/ImportButtons/PointImportButtonViz" +import {PointImportButtonViz} from "./Popup/ImportButtons/PointImportButtonViz" import WayImportButtonViz from "./Popup/ImportButtons/WayImportButtonViz" import ConflateImportButtonViz from "./Popup/ImportButtons/ConflateImportButtonViz" import DeleteWizard from "./Popup/DeleteFlow/DeleteWizard.svelte" -import { OpenJosm } from "./BigComponents/OpenJosm" +import {OpenJosm} from "./BigComponents/OpenJosm" import OpenIdEditor from "./BigComponents/OpenIdEditor.svelte" +import FediverseValidator from "./InputElement/Validators/FediverseValidator"; class NearbyImageVis implements SpecialVisualization { // Class must be in SpecialVisualisations due to weird cyclical import that breaks the tests @@ -180,7 +173,7 @@ class NearbyImageVis implements SpecialVisualization { towardsCenter, new Combine([ new VariableUiElement( - radius.GetValue().map((radius) => t.withinRadius.Subs({ radius })) + radius.GetValue().map((radius) => t.withinRadius.Subs({radius})) ), radius, ]).SetClass("flex justify-between"), @@ -393,24 +386,24 @@ export default class SpecialVisualizations { viz.docs, viz.args.length > 0 ? new Table( - ["name", "default", "description"], - viz.args.map((arg) => { - let defaultArg = arg.defaultValue ?? "_undefined_" - if (defaultArg == "") { - defaultArg = "_empty string_" - } - return [arg.name, defaultArg, arg.doc] - }) - ) + ["name", "default", "description"], + viz.args.map((arg) => { + let defaultArg = arg.defaultValue ?? "_undefined_" + if (defaultArg == "") { + defaultArg = "_empty string_" + } + return [arg.name, defaultArg, arg.doc] + }) + ) : undefined, new Title("Example usage of " + viz.funcName, 4), new FixedUiElement( viz.example ?? - "`{" + - viz.funcName + - "(" + - viz.args.map((arg) => arg.defaultValue).join(",") + - ")}`" + "`{" + + viz.funcName + + "(" + + viz.args.map((arg) => arg.defaultValue).join(",") + + ")}`" ).SetClass("literal-code"), ]) } @@ -469,14 +462,14 @@ export default class SpecialVisualizations { s.structuredExamples === undefined ? [] : s.structuredExamples().map((e) => { - return s.constr( - state, - new UIEventSource>(e.feature.properties), - e.args, - e.feature, - undefined - ) - }) + return s.constr( + state, + new UIEventSource>(e.feature.properties), + e.args, + e.feature, + undefined + ) + }) return new Combine([new Title(s.funcName), s.docs, ...examples]) } @@ -491,7 +484,7 @@ export default class SpecialVisualizations { let [lon, lat] = GeoOperations.centerpointCoordinates(feature) return new SvelteUIElement(AddNewPoint, { state, - coordinate: { lon, lat }, + coordinate: {lon, lat}, }) }, }, @@ -610,7 +603,7 @@ export default class SpecialVisualizations { feature: Feature ): BaseUIElement { const [lon, lat] = GeoOperations.centerpointCoordinates(feature) - return new SvelteUIElement(CreateNewNote, { state, coordinate: { lon, lat } }) + return new SvelteUIElement(CreateNewNote, {state, coordinate: {lon, lat}}) }, }, new CloseNoteButton(), @@ -687,7 +680,7 @@ export default class SpecialVisualizations { docs: "Prints all key-value pairs of the object - used for debugging", args: [], constr: (state, tags: UIEventSource) => - new SvelteUIElement(AllTagsPanel, { tags, state }), + new SvelteUIElement(AllTagsPanel, {tags, state}), }, { funcName: "image_carousel", @@ -1326,7 +1319,7 @@ export default class SpecialVisualizations { ], constr(state, featureTags, args) { const [key, tr] = args - const translation = new Translation({ "*": tr }) + const translation = new Translation({"*": tr}) return new VariableUiElement( featureTags.map((tags) => { const properties: object[] = JSON.parse(tags[key]) @@ -1344,12 +1337,32 @@ export default class SpecialVisualizations { ) }, }, + { + funcName: "fediverse_link", + docs: "Converts a fediverse username or link into a clickable link", + args: [{ + name: "key", + doc: "The attribute-name containing the link", + required: true + }], + constr(state: SpecialVisualizationState, tagSource: UIEventSource>, argument: string[], feature: Feature, layer: LayerConfig): BaseUIElement { + const key = argument[0] + const validator = new FediverseValidator() + return new VariableUiElement(tagSource.map(tags => tags[key]).map(fediAccount => { + fediAccount = validator.reformat(fediAccount) + const [_, username, host] = fediAccount.match(FediverseValidator.usernameAtServer) + + return new Link(fediAccount, "https://" + host + "/@" + username, true) + } + )) + } + } ] specialVisualizations.push(new AutoApplyButton(specialVisualizations)) const invalid = specialVisualizations - .map((sp, i) => ({ sp, i })) + .map((sp, i) => ({sp, i})) .filter((sp) => sp.sp.funcName === undefined) if (invalid.length > 0) { throw ( From 7a953348824f6d601c16a0e632aac8353e0283fb Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 9 Aug 2023 14:42:38 +0200 Subject: [PATCH 058/134] Fix: open correct menu if set in hash --- src/Logic/Web/ThemeViewStateHashActor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logic/Web/ThemeViewStateHashActor.ts b/src/Logic/Web/ThemeViewStateHashActor.ts index e69d00556..a474b029b 100644 --- a/src/Logic/Web/ThemeViewStateHashActor.ts +++ b/src/Logic/Web/ThemeViewStateHashActor.ts @@ -100,7 +100,7 @@ export default class ThemeViewStateHashActor { private loadStateFromHash(hash: string) { const state = this._state - const parts = hash.split(";") + const parts = hash.split(":") outer: for (const { toggle, name, showOverOthers, submenu } of state.guistate.allToggles) { for (const part of parts) { if (part === name) { From f511423845ffe867fcda22ea12052a26aa6885ba Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 10 Aug 2023 15:36:32 +0200 Subject: [PATCH 059/134] Scripts: small fixes --- scripts/generateDocs.ts | 10 +++++----- scripts/removeTranslationString.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/generateDocs.ts b/scripts/generateDocs.ts index a0ea6dd87..376cd4d20 100644 --- a/scripts/generateDocs.ts +++ b/scripts/generateDocs.ts @@ -10,7 +10,6 @@ import Title from "../src/UI/Base/Title" import QueryParameterDocumentation from "../src/UI/QueryParameterDocumentation" import ScriptUtils from "./ScriptUtils" import List from "../src/UI/Base/List" -import SharedTagRenderings from "../src/Customizations/SharedTagRenderings" import Translations from "../src/UI/i18n/Translations" import themeOverview from "../src/assets/generated/theme_overview.json" import LayoutConfig from "../src/Models/ThemeConfig/LayoutConfig" @@ -27,6 +26,7 @@ import ThemeViewState from "../src/Models/ThemeViewState" import Validators from "../src/UI/InputElement/Validators" import questions from "../src/assets/generated/layers/questions.json" import { LayerConfigJson } from "../src/Models/ThemeConfig/Json/LayerConfigJson" + function WriteFile( filename, html: BaseUIElement, @@ -384,11 +384,11 @@ WriteFile("./Docs/BuiltinQuestions.md", qLayer.GenerateDocumentation([], new Map } } for (const usedBuiltin of usedBuiltins) { - var using = layersUsingBuiltin.get(usedBuiltin) - if (using === undefined) { + const usingLayers = layersUsingBuiltin.get(usedBuiltin) + if (usingLayers === undefined) { layersUsingBuiltin.set(usedBuiltin, [layer.id]) } else { - using.push(layer.id) + usingLayers.push(layer.id) } } @@ -409,7 +409,7 @@ WriteFile("./Docs/URL_Parameters.md", QueryParameterDocumentation.GenerateQueryP "src/Logic/Web/QueryParameters.ts", "src/UI/QueryParameterDocumentation.ts", ]) -if (fakedom === undefined || window === undefined) { +if (fakedom === undefined) { throw "FakeDom not initialized" } QueryParameters.GetQueryParameter( diff --git a/scripts/removeTranslationString.ts b/scripts/removeTranslationString.ts index f7b55e2e8..e18a80038 100644 --- a/scripts/removeTranslationString.ts +++ b/scripts/removeTranslationString.ts @@ -1,5 +1,5 @@ import ScriptUtils from "./ScriptUtils" -import { Utils } from "../Utils" +import { Utils } from "../src/Utils" import * as fs from "fs" async function main(args: string[]) { From 488ef487e181de74c70841435c8c457f63302d67 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 10 Aug 2023 15:37:02 +0200 Subject: [PATCH 060/134] Chore: remove some no longer needed translations, add new translation --- langs/ca.json | 13 ------------- langs/cs.json | 13 ------------- langs/da.json | 13 ------------- langs/de.json | 13 ------------- langs/en.json | 14 +------------- langs/eo.json | 2 -- langs/es.json | 13 ------------- langs/fr.json | 13 ------------- langs/gl.json | 11 ----------- langs/hu.json | 11 ----------- langs/id.json | 9 --------- langs/it.json | 13 ------------- langs/ja.json | 11 ----------- langs/layers/da.json | 7 +++++++ langs/layers/de.json | 10 +++++++--- langs/layers/en.json | 16 +++++++++++++--- langs/layers/es.json | 7 +++++++ langs/layers/fr.json | 7 +++++++ langs/layers/nl.json | 10 +++++++--- langs/nb_NO.json | 12 ------------ langs/nl.json | 13 ------------- langs/pa_PK.json | 1 - langs/pl.json | 11 ----------- langs/pt.json | 13 ------------- langs/pt_BR.json | 11 ----------- langs/ru.json | 11 ----------- langs/zh_Hant.json | 13 ------------- 27 files changed, 49 insertions(+), 242 deletions(-) diff --git a/langs/ca.json b/langs/ca.json index d96cbec37..80b345b8f 100644 --- a/langs/ca.json +++ b/langs/ca.json @@ -262,21 +262,8 @@ "searching": "Cercant…" }, "sharescreen": { - "addToHomeScreen": "

Afegir-lo a la pantalla d'inici

Pots afegir aquesta web a la pantalla d'inici del teu smartphone per a que es vegi més nadiu. Apreta al botó 'Afegir a l'inici' a la barra d'adreces URL per fer-ho.", "copiedToClipboard": "Enllaç copiat al portapapers", - "downloadCustomTheme": "Descarrega la configuració per a aquest tema", - "downloadCustomThemeHelp": "Un contribuïdor amb experiència pot utilitzar un arxiu per a millorar el vostre tema", - "editThemeDescription": "Afegir o canviar preguntes d'aquesta petició", - "editThisTheme": "Editar aquest repte", "embedIntro": "

Inclou-ho a la teva pàgina web

Per favor, inclou aquest mapa dins de la teva pàgina web.
T'animem a que ho facis, no cal que demanis permís.
És gratuït, i sempre ho serà. A més gent que ho faci servir més valuós serà.", - "fsAddNew": "Activar el botó d'afegir nou PDI'", - "fsGeolocation": "Activar el botó de 'geolocalitza'm' (només mòbil)", - "fsIncludeCurrentBackgroundMap": "Incloure l'opció de fons actual {name}", - "fsIncludeCurrentLayers": "Incloure les opcions de capa actual", - "fsIncludeCurrentLocation": "Incloure localització actual", - "fsLayerControlToggle": "Iniciar el control de capes avançat", - "fsLayers": "Activar el control de capes", - "fsSearch": "Activar la barra de cerca", "fsUserbadge": "Activar el botó d'entrada", "fsWelcomeMessage": "Mostra el missatge emergent de benvinguda i pestanyes associades", "intro": "

Comparteix aquest mapa

Comparteix aquest mapa copiant l'enllaç de sota i enviant-lo a amics i família:", diff --git a/langs/cs.json b/langs/cs.json index 00d662fbd..16adfe561 100644 --- a/langs/cs.json +++ b/langs/cs.json @@ -262,21 +262,8 @@ "searching": "Hledání…" }, "sharescreen": { - "addToHomeScreen": "

Přidejte stránku na domovskou obrazovku

Tuto webovou stránku můžete snadno přidat na domovskou obrazovku vašeho smartphonu, aby působila nativně. Klikněte na tlačítko „Přidat na domovskou obrazovku“ na panelu s adresou URL.", "copiedToClipboard": "Odkaz zkopírovaný do schránky", - "downloadCustomTheme": "Stáhnout konfiguraci tohoto tématu", - "downloadCustomThemeHelp": "Zkušený přispěvatel může tento soubor použít k vylepšení vašeho tématu", - "editThemeDescription": "Přidejte nebo změňte otázky k tomuto tématu mapy", - "editThisTheme": "Upravit toto téma", "embedIntro": "

Vložte mapu na své webové stránky

Prosíme, vložte tuto mapu na své webové stránky.
Doporučujeme vám to udělat - nemusíte ani žádat o povolení.
Je a vždy to bude zdarma. Čím více lidí bude projekt používat, tím bude cennější.", - "fsAddNew": "Povolit tlačítko „přidat nový bod zájmu“", - "fsGeolocation": "Povolit tlačítko „geolokovat mě“ (pouze pro mobilní zařízení)", - "fsIncludeCurrentBackgroundMap": "Zahrnout aktuální volbu pozadí {name}", - "fsIncludeCurrentLayers": "Zahrnout aktuální volby vrstvy", - "fsIncludeCurrentLocation": "Zahrnout aktuální polohu", - "fsLayerControlToggle": "Začněte s rozšířeným ovládáním vrstvy", - "fsLayers": "Povolit ovládání vrstev", - "fsSearch": "Povolit vyhledávací pole", "fsUserbadge": "Povolit tlačítko přihlášení", "fsWelcomeMessage": "Zobrazit vyskakovací okno s uvítací zprávou a související karty", "intro": "

Sdílejte tuto mapu

Sdílejte tuto mapu zkopírováním níže uvedeného odkazu a jeho zasláním přátelům a rodině:", diff --git a/langs/da.json b/langs/da.json index 9b5e9d7ce..3fcbfa065 100644 --- a/langs/da.json +++ b/langs/da.json @@ -203,21 +203,8 @@ "searching": "Søger…" }, "sharescreen": { - "addToHomeScreen": "

Tilføj til din hjemmeskærm

Du kan let tilføje denne hjemmeside til din smartphones hjemmeskærm for at få den integreret. Klik på 'Tilføj til hjemmeskærm' knappen i URL-feltet for at gøre det.", "copiedToClipboard": "Link kopierer til udklipsholder", - "downloadCustomTheme": "Download opsætningen for dette tema", - "downloadCustomThemeHelp": "En erfaren bidragyder kan bruge denne fil til at forbedre dit tema", - "editThemeDescription": "Tilføj eller ret spørgsmål til dette korttema", - "editThisTheme": "Ret dette tema", "embedIntro": "

Indlejr på din hjemmeside

Indlejr venligst dette kort på din hjemmeside.
Vi tilskynder dig til det - du behøver ikke engang at spørge om tilladelse.
Det det frit og gratis og vil altid være det. Jo flere der bruger det, jo mere værdifuldt bliver det.", - "fsAddNew": "Slå 'tilføj nyt POI' knappen til", - "fsGeolocation": "Slå 'geolocate-me' knappen til (kun mobil)", - "fsIncludeCurrentBackgroundMap": "Inkluder det aktuelle baggrundsvalg {name}", - "fsIncludeCurrentLayers": "Inkluder det aktuelle valg af lag", - "fsIncludeCurrentLocation": "Inkludere det aktuelle sted", - "fsLayerControlToggle": "Start med lagkontrollen udvidet", - "fsLayers": "Slå lagkontrollen til", - "fsSearch": "Slå søgefeltet til", "fsUserbadge": "Slå loginknappen til", "fsWelcomeMessage": "Vis velkomstbeskeden og tilknyttede faner", "intro": "

Del dette kort

Del dette kort ved at kopiere linket nedenunder og send det til venner og familie:", diff --git a/langs/de.json b/langs/de.json index ff399a2cd..b29602088 100644 --- a/langs/de.json +++ b/langs/de.json @@ -304,21 +304,8 @@ "searching": "Suchen …" }, "sharescreen": { - "addToHomeScreen": "

Karte zum Startbildschirm hinzufügen

Fügen Sie diese Webseite zum Startbildschirm Ihres Smartphones hinzu, um ein natives Gefühl zu erhalten. Klicken Sie dazu in der Adressleiste auf die Schaltfläche 'Zum Startbildschirm hinzufügen'.", "copiedToClipboard": "Verknüpfung in Zwischenablage kopiert", - "downloadCustomTheme": "Konfiguration für diese Karte herunterladen", - "downloadCustomThemeHelp": "Ein erfahrener Mitwirkender kann diese Datei verwenden, um Ihr Thema zu verbessern", - "editThemeDescription": "Fragen zu diesem Thema hinzufügen oder ändern", - "editThisTheme": "Dieses Thema bearbeiten", "embedIntro": "

Karte in Webseiten einbetten

Betten Sie diese Karte in Ihre Webseite ein.
Wir ermutigen Sie gern dazu - Sie müssen nicht mal um Erlaubnis fragen.
Die Karte ist kostenlos und wird es immer sein. Je mehr Leute die Karte benutzen, desto wertvoller wird sie.", - "fsAddNew": "Schaltfläche 'neuen POI hinzufügen' aktivieren", - "fsGeolocation": "Schaltfläche 'Mich geolokalisieren' aktivieren (nur mobil)", - "fsIncludeCurrentBackgroundMap": "Aktuellen Hintergrund übernehmen ({name})", - "fsIncludeCurrentLayers": "Aktuelle Ebenenauswahl übernehmen", - "fsIncludeCurrentLocation": "Aktuelle Position übernehmen", - "fsLayerControlToggle": "Ausgeklappte Ebenenauswahl anzeigen", - "fsLayers": "Ebenensteuerung aktivieren", - "fsSearch": "Suchleiste aktivieren", "fsUserbadge": "Anmeldefeld aktivieren", "fsWelcomeMessage": "Begrüßung und Registerkarten anzeigen", "intro": "

Karte teilen

Mit dem folgenden Link können Sie diese Karte mit Freunden und Familie teilen:", diff --git a/langs/en.json b/langs/en.json index 24f6953cf..026bc3df5 100644 --- a/langs/en.json +++ b/langs/en.json @@ -304,21 +304,9 @@ "searching": "Searching…" }, "sharescreen": { - "addToHomeScreen": "

Add to your home screen

You can easily add this website to your smartphone home screen for a native feel. Click the 'Add to home screen' button in the URL bar to do this.", "copiedToClipboard": "Link copied to clipboard", - "downloadCustomTheme": "Download the configuration for this theme", - "downloadCustomThemeHelp": "An experienced contributor can use this file to improve your theme", - "editThemeDescription": "Add or change questions to this map theme", - "editThisTheme": "Edit this theme", + "documentation": "For more information on available URL-parameters, consult the documentation", "embedIntro": "

Embed on your website

Please, embed this map into your website.
We encourage you to do it - you don't even have to ask permission.
It is free, and always will be. The more people are using this, the more valuable it becomes.", - "fsAddNew": "Enable the 'add new POI' button", - "fsGeolocation": "Enable the 'geolocate-me' button (mobile only)", - "fsIncludeCurrentBackgroundMap": "Include the current background choice {name}", - "fsIncludeCurrentLayers": "Include the current layer choices", - "fsIncludeCurrentLocation": "Include current location", - "fsLayerControlToggle": "Start with the layer control expanded", - "fsLayers": "Enable the layer control", - "fsSearch": "Enable the search bar", "fsUserbadge": "Enable the login button", "fsWelcomeMessage": "Show the welcome message popup and associated tabs", "intro": "

Share this map

Share this map by copying the link below and sending it to friends and family:", diff --git a/langs/eo.json b/langs/eo.json index eb175272c..ef95a47de 100644 --- a/langs/eo.json +++ b/langs/eo.json @@ -61,8 +61,6 @@ "searching": "Serĉante…" }, "sharescreen": { - "editThisTheme": "Modifi ĉi tiun etoson", - "fsSearch": "Ŝalti la serĉbreton", "fsUserbadge": "Ŝalti la salutbutonon" }, "skip": "Preterpasi ĉi tiun demandon", diff --git a/langs/es.json b/langs/es.json index 4a3d2da7b..96a06e3dc 100644 --- a/langs/es.json +++ b/langs/es.json @@ -209,21 +209,8 @@ "searching": "Buscando…" }, "sharescreen": { - "addToHomeScreen": "

Añadir a la pantalla de inicio

Puedes añadir esta web en la pantalla de inicio de tu smartphone para que se vea más nativo. Aprieta el botón 'añadir a inicio' en la barra de direcciones URL para hacerlo.", "copiedToClipboard": "Enlace copiado en el portapapeles", - "downloadCustomTheme": "Descargar la configuración para este tema", - "downloadCustomThemeHelp": "Un contributor con experiencia puede utilizar este archivo para mejorar tu tema", - "editThemeDescription": "Añadir o cambiar preguntas de este reto", - "editThisTheme": "Editar este reto", "embedIntro": "

Inclúyelo en tu página web

Incluye este mapa en tu página web.
Te animamos a que lo hagas, no hace falta que pidas permiso.
Es gratis, y siempre lo será. A más gente que lo use más valioso será.", - "fsAddNew": "Activar el botón de añadir nuevo PDI'", - "fsGeolocation": "Activar el botón de 'geolocalízame' (només mòbil)", - "fsIncludeCurrentBackgroundMap": "Incluir la opción de fondo actual {name}", - "fsIncludeCurrentLayers": "Incluir las opciones de capa actual", - "fsIncludeCurrentLocation": "Incluir localización actual", - "fsLayerControlToggle": "Iniciar el control de capas avanzado", - "fsLayers": "Activar el control de capas", - "fsSearch": "Activar la barra de búsqueda", "fsUserbadge": "Activar el botón de entrada", "fsWelcomeMessage": "Muestra el mensaje emergente de bienvenida y pestañas asociadas", "intro": "

Comparte este mapa

Comparte este mapa copiando el enlace de debajo y enviándolo a amigos y familia:", diff --git a/langs/fr.json b/langs/fr.json index 7527e367f..08a5671bc 100644 --- a/langs/fr.json +++ b/langs/fr.json @@ -242,21 +242,8 @@ "searching": "Chargement…" }, "sharescreen": { - "addToHomeScreen": "

Ajouter à votre page d'accueil

Vous pouvez facilement ajouter la carte à votre écran d'accueil de téléphone. Cliquer sur le bouton 'ajouter à l'écran d'accueil' dans la barre d'adresse pour effectuer cette tâche.", "copiedToClipboard": "Lien copié dans le presse-papier", - "downloadCustomTheme": "Téléchargez la configuration de ce thème", - "downloadCustomThemeHelp": "Un contributeur expérimenté peut utiliser ce fichier pour améliorer votre thème", - "editThemeDescription": "Ajouter ou modifier des questions à ce thème", - "editThisTheme": "Editer ce thème", "embedIntro": "

Incorporer à votre site Web

Ajouter la carte à votre site Web.
Nous vous y encourageons – pas besoin de permission.
C'est gratuit et pour toujours. Plus de personnes l'utilisent, mieux c'est.", - "fsAddNew": "Activer le bouton 'ajouter un POI'", - "fsGeolocation": "Activer le bouton 'Localisez-moi' (seulement sur mobile)", - "fsIncludeCurrentBackgroundMap": "Include le choix actuel d'arrière plan {name}", - "fsIncludeCurrentLayers": "Inclure la couche selectionnée", - "fsIncludeCurrentLocation": "Inclure l'emplacement actuel", - "fsLayerControlToggle": "Démarrer avec le contrôle des couches ouvert", - "fsLayers": "Activer le contrôle des couches", - "fsSearch": "Activer la barre de recherche", "fsUserbadge": "Activer le bouton de connexion", "fsWelcomeMessage": "Afficher le message de bienvenue et les onglets associés", "intro": "

Partager cette carte

Partagez cette carte en copiant le lien suivant et envoyez-le à vos amis :", diff --git a/langs/gl.json b/langs/gl.json index 827178951..ed4dc6c29 100644 --- a/langs/gl.json +++ b/langs/gl.json @@ -101,19 +101,8 @@ "searching": "Procurando..." }, "sharescreen": { - "addToHomeScreen": "

Engadir á pantalla de inicio

Podes engadir esta web na pantalla de inicio do teu smartphone para que se vexa máis nativo. Preme o botón 'engadir ó inicio' na barra de enderezos URL para facelo.", "copiedToClipboard": "Ligazón copiada ó portapapeis", - "editThemeDescription": "Engadir ou mudar preguntas a este tema do mapa", - "editThisTheme": "Editar este tema", "embedIntro": "

Inclúeo na túa páxina web

Inclúe este mapa na túa páxina web.
Animámoche a que o fagas, non fai falla que pidas permiso.
É de balde, e sempre será. Canta máis xente que o empregue máis valioso será.", - "fsAddNew": "Activar o botón de 'engadir novo PDI'", - "fsGeolocation": "Activar o botón de 'xeolocalizarme' (só móbil)", - "fsIncludeCurrentBackgroundMap": "Incluír a opción de fondo actual {name}", - "fsIncludeCurrentLayers": "Incluír as opcións de capa actual", - "fsIncludeCurrentLocation": "Incluír localización actual", - "fsLayerControlToggle": "Comenza co control de capas expandido", - "fsLayers": "Activar o control de capas", - "fsSearch": "Activar a barra de procura", "fsUserbadge": "Activar botón de inicio de sesión", "fsWelcomeMessage": "Amosar a xanela emerxente da mensaxe de benvida e as lapelas asociadas", "intro": "

Comparte este mapa

Comparte este mapa copiando a ligazón de embaixo e enviándoa ás amizades e familia:", diff --git a/langs/hu.json b/langs/hu.json index afd36563b..eb0a18b76 100644 --- a/langs/hu.json +++ b/langs/hu.json @@ -196,19 +196,8 @@ "searching": "Keresés…" }, "sharescreen": { - "addToHomeScreen": "

Hozzáadás a kezdőképernyőhöz

Könnyedén hozzáadhatod ezt a weboldalt az okostelefon kezdőképernyőjéhez a natív hangulat érdekében. Ehhez kattints az URL-sávban a „Hozzáadás a kezdőképernyőhöz” gombra.", "copiedToClipboard": "Link a vágólapra másolva", - "editThemeDescription": "Térképtémához tartozó kérdések hozzáadása vagy módosítása", - "editThisTheme": "Téma szerkesztése", "embedIntro": "

Beágyazás egy weboldalon

Kérjük, illeszd be ezt a térképet a weboldalba.
Biztatunk, tedd meg – még engedélyt sem kell kérned.
Ingyenes, és az is marad. Minél többen használják, annál értékesebbé válik. A pipákra kattintva módosíthatod a paramétereket:", - "fsAddNew": "„Új érdekes pont (POI) hozzáadása” gomb engedélyezése", - "fsGeolocation": "„Saját helyem megjelenítése” gomb engedélyezése (csak mobileszközön)", - "fsIncludeCurrentBackgroundMap": "Tartalmazza a jelenleg kiválasztott hátteret ({name})", - "fsIncludeCurrentLayers": "Tartalmazza a jelenleg kiválasztott rétegeket", - "fsIncludeCurrentLocation": "Tartalmazza az aktuális helyet", - "fsLayerControlToggle": "Kezdés kibontott rétegvezérlővel", - "fsLayers": "Rétegvezérlő engedélyezése", - "fsSearch": "Keresősáv engedélyezése", "fsUserbadge": "Bejelentkezési gomb engedélyezése", "fsWelcomeMessage": "Felugró üdvözlő üzenet és kapcsolódó fülek megjelenítése", "intro": "

Térkép megosztása

Oszd meg ezt a térképet! Másold ki az alábbi linket, és küldd el a barátaidnak és a családodnak:", diff --git a/langs/id.json b/langs/id.json index 7fa0ddf5e..69e86090a 100644 --- a/langs/id.json +++ b/langs/id.json @@ -106,15 +106,6 @@ }, "sharescreen": { "copiedToClipboard": "Tautan disalin ke papan klip", - "editThemeDescription": "Tambahkan atau ubah pertanyaan ke tema peta ini", - "editThisTheme": "Sunting tema ini", - "fsAddNew": "Aktifkan tombol 'tambah POI baru'", - "fsGeolocation": "Aktifkan tombol 'geolocate-me' (hanya seluler)", - "fsIncludeCurrentBackgroundMap": "Sertakan pilihan latar belakang saat ini {name}", - "fsIncludeCurrentLayers": "Sertakan pilihan lapisan saat ini", - "fsIncludeCurrentLocation": "Sertakan lokasi saat ini", - "fsLayers": "Aktifkan kontrol lapisan", - "fsSearch": "Aktifkan bilah pencarian", "fsUserbadge": "Aktifkan tombol masuk", "fsWelcomeMessage": "Tampilkan popup pesan selamat datang dan tab terkait", "thanksForSharing": "Terima kasih telah berbagi!" diff --git a/langs/it.json b/langs/it.json index 171f0fcbd..d3ff401ef 100644 --- a/langs/it.json +++ b/langs/it.json @@ -204,21 +204,8 @@ "searching": "Ricerca…" }, "sharescreen": { - "addToHomeScreen": "

Aggiungi alla tua schermata Home

Puoi aggiungere facilmente questo sito web alla schermata Home del tuo smartphone. Per farlo, clicca sul pulsante ‘Aggiungi a schermata Home’ nella barra degli indirizzi.", "copiedToClipboard": "Collegamento copiato negli appunti", - "downloadCustomTheme": "Scarica la configurazione di questo argomento", - "downloadCustomThemeHelp": "Una persona esperta può utilizzare questo file per migliorare il tuo argomento", - "editThemeDescription": "Aggiungi o modifica le domande a questo tema della mappa", - "editThisTheme": "Modifica questo tema", "embedIntro": "

Incorpora nel tuo sito web

Siamo lieti se vorrai includere questa cartina nel tuo sito web.
Ti incoraggiamo a farlo (non devi neanche chieder il permesso).
È gratuito e lo sarà per sempre. Più persone lo useranno e più valore acquisirà.", - "fsAddNew": "Abilita il pulsante ‘aggiungi nuovo PDI’", - "fsGeolocation": "Abilita il pusante ‘geo-localizzami’ (solo da mobile)", - "fsIncludeCurrentBackgroundMap": "Includi lo sfondo attualmente selezionato {name}", - "fsIncludeCurrentLayers": "Includi i livelli correntemente selezionati", - "fsIncludeCurrentLocation": "Includi la posizione attuale", - "fsLayerControlToggle": "Inizia con il pannello dei livelli aperto", - "fsLayers": "Abilita il controllo dei livelli", - "fsSearch": "Abilita la barra di ricerca", "fsUserbadge": "Abilita il pulsante di accesso", "fsWelcomeMessage": "Mostra il messaggio di benvenuto e le schede associate", "intro": "

Condividi questa mappa

Condividi questa mappa copiando il collegamento qua sotto e inviandolo ad amici o parenti:", diff --git a/langs/ja.json b/langs/ja.json index 9d78c1e1c..6418961d5 100644 --- a/langs/ja.json +++ b/langs/ja.json @@ -101,19 +101,8 @@ "searching": "検索中…" }, "sharescreen": { - "addToHomeScreen": "

ホーム画面に追加する

このサイトはスマートフォンのホーム画面に簡単に追加でき、ネイティブな雰囲気になります。これを行うには、URLバーの「ホーム画面に追加ボタン」をクリックします。", "copiedToClipboard": "クリップボードにコピーされたリンク", - "editThemeDescription": "このマップテーマに質問を追加または変更する", - "editThisTheme": "このテーマを編集", "embedIntro": "

お客様のWebサイトに埋め込む

この地図をお客様のWebサイトに埋め込みます。
許可を得る必要もありませんので、ぜひご利用ください。
無料であり、常に利用できます。使う人が増えれば増えるほど、価値が増大します。", - "fsAddNew": "[新しいPOIの追加]ボタンを有効にする", - "fsGeolocation": "[geolocate-me]ボタンを有効にする(モバイルのみ)", - "fsIncludeCurrentBackgroundMap": "現在の背景の選択肢{name}を含める", - "fsIncludeCurrentLayers": "現在のレイヤの選択肢を含める", - "fsIncludeCurrentLocation": "現在の場所を含める", - "fsLayerControlToggle": "レイヤコントロールを展開して開始", - "fsLayers": "レイヤコントロールを有効にする", - "fsSearch": "検索バーを有効にする", "fsUserbadge": "ログインボタンを有効にする", "fsWelcomeMessage": "ウェルカムメッセージのポップアップと関連するタブを表示します", "intro": "

このマップを共有

このマップを共有するには、次のリンクをコピーして、友人や家族に送信します。", diff --git a/langs/layers/da.json b/langs/layers/da.json index 029940a8a..d21af0de0 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2065,6 +2065,13 @@ "question": "Har en halalmenu" } } + }, + "5": { + "options": { + "0": { + "question": "Har en halalmenu" + } + } } }, "name": "Restauranter og fastfood" diff --git a/langs/layers/de.json b/langs/layers/de.json index 3f2b2918f..141874ae2 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4754,6 +4754,13 @@ "question": "Halal Gerichte im Angebot" } } + }, + "5": { + "options": { + "0": { + "question": "Halal Gerichte im Angebot" + } + } } }, "name": "Restaurants und Imbisse", @@ -5855,9 +5862,6 @@ "mappings": { "0": { "then": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt" - }, - "1": { - "then": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt" } }, "question": "Wie hoch ist die zulässige Höchstgeschwindigkeit, die man auf dieser Straße fahren darf?", diff --git a/langs/layers/en.json b/langs/layers/en.json index bbbdb9367..28f683e3c 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4738,6 +4738,12 @@ "options": { "0": { "question": "Has a vegetarian menu" + }, + "1": { + "question": "Only fastfood buisinesses" + }, + "2": { + "question": "Only restaurants" } } }, @@ -4754,6 +4760,13 @@ "question": "Has a halal menu" } } + }, + "5": { + "options": { + "0": { + "question": "Has a halal menu" + } + } } }, "name": "Restaurants and fast food", @@ -5855,9 +5868,6 @@ "mappings": { "0": { "then": "This is a living street, which has a maxspeed of 20km/h" - }, - "1": { - "then": "This is a living street, which has a maxspeed of 20km/h" } }, "question": "What is the legal maximum speed one is allowed to drive on this road?", diff --git a/langs/layers/es.json b/langs/layers/es.json index 28a0c8b25..101a6f079 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2610,6 +2610,13 @@ "question": "Tiene menú halah" } } + }, + "5": { + "options": { + "0": { + "question": "Tiene menú halah" + } + } } }, "name": "Restaurantes y comida rápida", diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 5f3dae47f..0b5771aa3 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -3278,6 +3278,13 @@ "question": "A un menu halal" } } + }, + "5": { + "options": { + "0": { + "question": "A un menu halal" + } + } } }, "name": "Restaurants et nourriture rapide", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 477ddd2c3..aeedb955a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4530,6 +4530,13 @@ "question": "Heeft een halal menu" } } + }, + "5": { + "options": { + "0": { + "question": "Heeft een halal menu" + } + } } }, "name": "Eetgelegenheden", @@ -5553,9 +5560,6 @@ "mappings": { "0": { "then": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" - }, - "1": { - "then": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h" } }, "question": "Wat is de legale maximumsnelheid voor deze weg?", diff --git a/langs/nb_NO.json b/langs/nb_NO.json index 7856c11fb..f9c61d57a 100644 --- a/langs/nb_NO.json +++ b/langs/nb_NO.json @@ -233,20 +233,8 @@ "searching": "Søker …" }, "sharescreen": { - "addToHomeScreen": "

Legg til på hjemmeskjermen din

Du kan enkelt legge til denne nettsiden på din smarttelefon-hjemmeskjerm for å få det hele integrert. Klikk på «Legg til på hjemmeskjerm»-knappen i nettadressefeltet for å gjøre dette.", "copiedToClipboard": "Lenke kopiert til utklippstavle", - "downloadCustomTheme": "Last ned oppsettet for dette temaet", - "downloadCustomThemeHelp": "En dreven bidragsyter kan bruke denne filen for å forbedre temaet ditt", - "editThemeDescription": "Legg til eller endre spørsmål for dette karttemaet", - "editThisTheme": "Rediger dette temaet", "embedIntro": "

Bygg inn på nettsiden din

Legg til dette kartet på nettsiden din.
Du oppfordres til å gjøre dette, og trenger ikke å spørre om tillatelse.
Det er fritt, og vil alltid være det. Desto flere som bruker dette, desto mer verdifullt blir det.", - "fsGeolocation": "Skru på «Geolokaliser meg»-knappen (kun for mobil)", - "fsIncludeCurrentBackgroundMap": "Inkluder nåværende bakgrunnsvalg {name}", - "fsIncludeCurrentLayers": "Inkluder nåværende lagvalg", - "fsIncludeCurrentLocation": "Inkluder nåværende posisjon", - "fsLayerControlToggle": "Start med lagkontrollen utvidet", - "fsLayers": "Skru på lagkontrollen", - "fsSearch": "Skru på søkefeltet", "fsUserbadge": "Skru på innloggingsknappen", "fsWelcomeMessage": "Vis velkomst-oppsprettsmeldinger og tilknyttede faner", "intro": "

Del dette kartet

Del dette kartet ved å kopiere lenken nedenfor og sende den til venner og familie:", diff --git a/langs/nl.json b/langs/nl.json index adfb3b0af..1f2d39ce4 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -304,21 +304,8 @@ "searching": "Aan het zoeken…" }, "sharescreen": { - "addToHomeScreen": "

Voeg toe aan je thuisscherm

Je kan eenvoudigweg deze website aan het thuisscherm van je smartphone toevoegen voor een \"native feel\"", "copiedToClipboard": "Link gekopieerd naar klembord", - "downloadCustomTheme": "Download de instellingen van dit thema", - "downloadCustomThemeHelp": "Een ervaren bijdrager kan op basis van dit bestand je thema verder verbeteren", - "editThemeDescription": "Pas vragen aan of voeg vragen toe aan dit kaartthema", - "editThisTheme": "Pas dit thema aan", "embedIntro": "

Plaats dit op je website

Voeg dit kaartje toe op je eigen website.
We moedigen dit zelfs aan - je hoeft geen toestemming te vragen.
Het is gratis en zal dat altijd blijven. Hoe meer het gebruikt wordt, hoe waardevoller", - "fsAddNew": "Activeer het toevoegen van nieuwe POI", - "fsGeolocation": "Toon het knopje voor geolocalisatie (enkel op mobiel)", - "fsIncludeCurrentBackgroundMap": "Gebruik de huidige achtergrond {name}", - "fsIncludeCurrentLayers": "Toon enkel de huidig getoonde lagen", - "fsIncludeCurrentLocation": "Start op de huidige locatie", - "fsLayerControlToggle": "Toon de laagbediening meteen volledig", - "fsLayers": "Toon de knop voor laagbediening", - "fsSearch": "Activeer de zoekbalk", "fsUserbadge": "Activeer de login-knop", "fsWelcomeMessage": "Toon het welkomstbericht en de bijhorende tabbladen", "intro": "

Deel deze kaart

Kopieer onderstaande link om deze kaart naar vrienden en familie door te sturen:", diff --git a/langs/pa_PK.json b/langs/pa_PK.json index b59c81bbb..15de79618 100644 --- a/langs/pa_PK.json +++ b/langs/pa_PK.json @@ -55,7 +55,6 @@ "searching": "کھوجیا جا رہا اے۔ ۔ ۔" }, "sharescreen": { - "editThisTheme": "ایہہ تھیم سودھو", "thanksForSharing": "ٹھیک اے، مہربانی۔" }, "weekdays": { diff --git a/langs/pl.json b/langs/pl.json index b5003ebd8..cfa569f96 100644 --- a/langs/pl.json +++ b/langs/pl.json @@ -98,19 +98,8 @@ "searching": "Szukanie…" }, "sharescreen": { - "addToHomeScreen": "

Dodaj do ekranu głównego

Możesz łatwo dodać tę stronę do ekranu głównego smartfona, aby poczuć się jak w domu. Kliknij przycisk \"Dodaj do ekranu głównego\" na pasku adresu URL, aby to zrobić.", "copiedToClipboard": "Link został skopiowany do schowka", - "editThemeDescription": "Dodaj lub zmień pytania do tego motywu mapy", - "editThisTheme": "Edytuj ten motyw", "embedIntro": "

Umieść na swojej stronie internetowej

Proszę, umieść tę mapę na swojej stronie internetowej.
Zachęcamy cię do tego - nie musisz nawet pytać o zgodę.
Jest ona darmowa i zawsze będzie. Im więcej osób jej używa, tym bardziej staje się wartościowa.", - "fsAddNew": "Włącz przycisk \"Dodaj nowe POI\"", - "fsGeolocation": "Włącz przycisk „Zlokalizuj mnie” (tylko na urządzeniach mobilnych)", - "fsIncludeCurrentBackgroundMap": "Dołącz bieżący wybór tła {name}", - "fsIncludeCurrentLayers": "Uwzględnij wybór bieżącej warstwy", - "fsIncludeCurrentLocation": "Uwzględnij bieżącą lokalizację", - "fsLayerControlToggle": "Zacznij od rozwiniętej kontroli warstw", - "fsLayers": "Włącz kontrolę warstw", - "fsSearch": "Włącz pasek wyszukiwania", "fsUserbadge": "Włącz przycisk logowania", "fsWelcomeMessage": "Pokaż wyskakujące okienko wiadomości powitalnej i powiązane zakładki", "intro": "

Udostępnij tę mapę

Udostępnij tę mapę, kopiując poniższy link i wysyłając ją do przyjaciół i rodziny:", diff --git a/langs/pt.json b/langs/pt.json index c6ac285a5..96dad7548 100644 --- a/langs/pt.json +++ b/langs/pt.json @@ -242,21 +242,8 @@ "searching": "A procurar…" }, "sharescreen": { - "addToHomeScreen": "

Adicionar ao seu ecrã inicial

Pode adicionar facilmente este site ao ecrã inicial do seu telemóvel. Para isso clique no botão 'Adicionar ao ecrã inicial' na barra de URL.", "copiedToClipboard": "Hiperligação copiada para a área de transferência", - "downloadCustomTheme": "Descarregar a configuração para este tema", - "downloadCustomThemeHelp": "Um colaborador experiente pode utilizar este ficheiro para melhorar o seu tema", - "editThemeDescription": "Adicionar ou alterar perguntas deste tema", - "editThisTheme": "Editar este tema", "embedIntro": "

Incorporar no seu site

Por favor, insira este mapa no seu site.
Encorajamos a fazê-lo - nem precisa de pedir permissão.
É grátis e sempre será. Quanto mais pessoas estiverem a usar isto, mais valioso se torna.", - "fsAddNew": "Ativar o botão 'adicionar novo POI'", - "fsGeolocation": "Ativar o botão 'localizar-me geograficamente' (apenas telemóvel)", - "fsIncludeCurrentBackgroundMap": "Incluir a escolha de fundo atual {name}", - "fsIncludeCurrentLayers": "Incluir as opções de camada atuais", - "fsIncludeCurrentLocation": "Incluir localização atual", - "fsLayerControlToggle": "Começar com o controlo de camadas expandido", - "fsLayers": "Ativar o controlo das camadas", - "fsSearch": "Ativar a barra de pesquisa", "fsUserbadge": "Ativar o botão de iniciar sessão", "fsWelcomeMessage": "Mostrar a janela com a mensagem de boas-vindas e separadores associados", "intro": "

Partilhar este mapa

Partilhe este mapa copiando a hiperligação abaixo e enviando-a a amigos e familiares:", diff --git a/langs/pt_BR.json b/langs/pt_BR.json index 8998369c2..c72ba63eb 100644 --- a/langs/pt_BR.json +++ b/langs/pt_BR.json @@ -98,19 +98,8 @@ "searching": "Procurando…" }, "sharescreen": { - "addToHomeScreen": "

Adicionar à sua tela inicial

Você pode adicionar facilmente este site à tela inicial do smartphone para uma sensação nativa. Clique no botão 'adicionar à tela inicial' na barra de URL para fazer isso.", "copiedToClipboard": "Link copiado para a área de transferência", - "editThemeDescription": "Adicione ou altere perguntas a este tema do mapa", - "editThisTheme": "Editar neste tema", "embedIntro": "

Incorpore em seu site

Por favor, incorpore este mapa em seu site.
Nós o encorajamos a fazer isso - você nem precisa pedir permissão.
É gratuito e sempre será. Quanto mais pessoas usarem isso, mais valioso se tornará.", - "fsAddNew": "Habilite o botão 'adicionar novo POI'", - "fsGeolocation": "Ative o botão 'localizar-me geograficamente' (apenas para celular)", - "fsIncludeCurrentBackgroundMap": "Incluir a escolha de fundo atual {name}", - "fsIncludeCurrentLayers": "Incluir as opções de camada atuais", - "fsIncludeCurrentLocation": "Incluir localização atual", - "fsLayerControlToggle": "Iniciar com o controle de camada expandido", - "fsLayers": "Ativar o controle de camada", - "fsSearch": "Ativar a barra de pesquisa", "fsUserbadge": "Habilite o botão de login", "fsWelcomeMessage": "Mostra o pop-up da mensagem de boas-vindas e as guias associadas", "intro": "

Compartilhe este mapa

Compartilhe este mapa copiando o link abaixo e enviando-o para amigos e familiares:", diff --git a/langs/ru.json b/langs/ru.json index c666b2e07..aaa9683b7 100644 --- a/langs/ru.json +++ b/langs/ru.json @@ -114,19 +114,8 @@ "searching": "Поиск…" }, "sharescreen": { - "addToHomeScreen": "

Добавить на домашний экран

Вы можете легко добавить этот сайт на домашний экран вашего смартфона. Для этого нажмите кнопку \"Добавить на главный экран\" в строке URL.", "copiedToClipboard": "Ссылка скопирована в буфер обмена", - "editThemeDescription": "Добавить или изменить вопросы к этой теме карты", - "editThisTheme": "Редактировать эту тему", "embedIntro": "

Встроить на свой сайт

Пожалуйста, вставьте эту карту на свой сайт.
Мы призываем вас сделать это - вам даже не нужно спрашивать разрешения.
Карта бесплатна и всегда будет бесплатной. Чем больше людей пользуются ею, тем более ценной она становится.", - "fsAddNew": "Включить кнопку \"добавить новую точку интереса\"", - "fsGeolocation": "Включить кнопку \"найди меня\" (только в мобильной версии)", - "fsIncludeCurrentBackgroundMap": "Включить текущий фоновый слой {name}", - "fsIncludeCurrentLayers": "Включить текущие выбранные слои", - "fsIncludeCurrentLocation": "Включить текущее местоположение карты", - "fsLayerControlToggle": "Открыть панель выбора слоя", - "fsLayers": "Включить выбор слоя карты", - "fsSearch": "Включить строку поиска", "fsUserbadge": "Включить кнопку входа в систему", "fsWelcomeMessage": "Показать всплывающее окно с приветствием и соответствующие вкладки", "intro": "

Поделиться этой картой

Поделитесь этой картой, скопировав ссылку ниже и отправив её друзьям и близким:", diff --git a/langs/zh_Hant.json b/langs/zh_Hant.json index 3d48b102e..006584847 100644 --- a/langs/zh_Hant.json +++ b/langs/zh_Hant.json @@ -226,21 +226,8 @@ "searching": "搜尋中…" }, "sharescreen": { - "addToHomeScreen": "

新增到你主頁畫面

你可以輕易將這網站加到你智慧型手機的主頁畫面，在網址列點選 '新增到主頁按鈕'來做這件事情。", "copiedToClipboard": "複製連結到簡貼簿", - "downloadCustomTheme": "下載這個主題的設定", - "downloadCustomThemeHelp": "有經驗的貢獻者能使用這個檔案來改善你的主題", - "editThemeDescription": "新增或改變這個地圖主題的問題", - "editThisTheme": "編輯這個主題", "embedIntro": "

嵌入到你的網站

請考慮將這份地圖嵌入您的網站。
地圖毋須額外授權，非常歡迎您多加利用。
一切都是免費的，而且之後也是免費的，越有更多人使用，則越顯得它的價值。", - "fsAddNew": "啟用'新增新的興趣點'按鈕", - "fsGeolocation": "啟用'地理定位自身'按鈕 (只有行動版本)", - "fsIncludeCurrentBackgroundMap": "包含目前背景選擇{name}", - "fsIncludeCurrentLayers": "包含目前選擇圖層", - "fsIncludeCurrentLocation": "包含目前位置", - "fsLayerControlToggle": "開始時擴展圖層控制", - "fsLayers": "啟用圖層控制", - "fsSearch": "啟用搜尋列", "fsUserbadge": "啟用登入按鈕", "fsWelcomeMessage": "顯示歡迎訊息以及相關頁籤", "intro": "

分享這地圖

複製下面的連結來向朋友與家人分享這份地圖：", From b30b029aff65851a950aba8ba0603b0f53b68da6 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 10 Aug 2023 15:37:20 +0200 Subject: [PATCH 061/134] Chore: translation sync --- assets/layers/food/food.json | 27 +++--- assets/layers/maxspeed/maxspeed.json | 4 +- assets/themes/fritures/fritures.json | 4 +- .../mapcomplete-changes.json | 97 ++++++++++++++----- 4 files changed, 92 insertions(+), 40 deletions(-) diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 087051127..6030d3a35 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -966,7 +966,11 @@ "options": [ { "question": { - "en": "All categories" + "en": "Has a vegetarian menu", + "de": "Vegetarische Gerichte im Angebot", + "es": "Tiene menú vegetariano", + "fr": "A un menu végétarien", + "nl": "Heeft een vegetarisch menu" } }, { @@ -988,11 +992,11 @@ "options": [ { "question": { - "en": "Has a vegetarian menu", - "nl": "Heeft een vegetarisch menu", - "de": "Vegetarische Gerichte im Angebot", - "es": "Tiene menú vegetariano", - "fr": "A un menu végétarien" + "en": "Has a vegan menu", + "nl": "Heeft een veganistisch menu", + "de": "Vegane Gerichte im Angebot", + "es": "Tiene menú vegano", + "fr": "A un menu végétalien" }, "osmTags": { "or": [ @@ -1010,11 +1014,12 @@ "options": [ { "question": { - "en": "Has a vegan menu", - "nl": "Heeft een veganistisch menu", - "de": "Vegane Gerichte im Angebot", - "es": "Tiene menú vegano", - "fr": "A un menu végétalien" + "en": "Has a halal menu", + "nl": "Heeft een halal menu", + "de": "Halal Gerichte im Angebot", + "es": "Tiene menú halah", + "fr": "A un menu halal", + "da": "Har en halalmenu" }, "osmTags": { "or": [ diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json index 3ee814e94..1c5304cd3 100644 --- a/assets/layers/maxspeed/maxspeed.json +++ b/assets/layers/maxspeed/maxspeed.json @@ -90,7 +90,9 @@ "path": "./assets/layers/maxspeed/living_street_be.svg", "class": "large" }, - "addExtraTags": ["maxspeed=20"], + "addExtraTags": [ + "maxspeed=20" + ], "hideInAnswer": "_country!=be" } ], diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json index 8f2f3bfda..18804d332 100644 --- a/assets/themes/fritures/fritures.json +++ b/assets/themes/fritures/fritures.json @@ -63,10 +63,10 @@ { "builtin": "food", "override": { - "minzoom": 19, + "minzoom": 18, "filter": null, "name": null } } ] -} \ No newline at end of file +} diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 56555e871..deda66b65 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,19 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +26,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +39,51 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}" } }, { @@ -74,19 +92,27 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +133,12 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}" }, "freeform": { "key": "editor" @@ -452,7 +480,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +498,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +516,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +535,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +554,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +572,9 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +590,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +603,9 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +620,8 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier" } }, { From 96d036781f55987732629355be118373c363830d Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 10 Aug 2023 15:37:44 +0200 Subject: [PATCH 062/134] Fix: update and simplification of sharescreen, rename some feature switches, remove some no longer relevant feature switches --- src/Logic/State/FeatureSwitchState.ts | 21 +- src/Logic/Web/QueryParameters.ts | 30 ++- src/Logic/Web/ThemeViewStateHashActor.ts | 16 ++ src/Models/MenuState.ts | 8 +- src/Models/ThemeViewState.ts | 11 +- src/UI/BigComponents/ShareScreen.svelte | 121 +++++++++ src/UI/BigComponents/ShareScreen.ts | 256 -------------------- src/UI/BigComponents/ThemeIntroPanel.svelte | 2 - src/UI/QueryParameterDocumentation.ts | 2 + src/UI/ThemeViewGUI.svelte | 109 ++++----- src/Utils.ts | 19 ++ 11 files changed, 252 insertions(+), 343 deletions(-) create mode 100644 src/UI/BigComponents/ShareScreen.svelte delete mode 100644 src/UI/BigComponents/ShareScreen.ts diff --git a/src/Logic/State/FeatureSwitchState.ts b/src/Logic/State/FeatureSwitchState.ts index ebdb057c9..389c966a8 100644 --- a/src/Logic/State/FeatureSwitchState.ts +++ b/src/Logic/State/FeatureSwitchState.ts @@ -51,10 +51,9 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { */ public readonly layoutToUse: LayoutConfig - public readonly featureSwitchUserbadge: UIEventSource + public readonly featureSwitchEnableLogin: UIEventSource public readonly featureSwitchSearch: UIEventSource public readonly featureSwitchBackgroundSelection: UIEventSource - public readonly featureSwitchAddNew: UIEventSource public readonly featureSwitchWelcomeMessage: UIEventSource public readonly featureSwitchCommunityIndex: UIEventSource public readonly featureSwitchExtraLinkEnabled: UIEventSource @@ -78,10 +77,10 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { // Helper function to initialize feature switches - this.featureSwitchUserbadge = FeatureSwitchUtils.initSwitch( - "fs-userbadge", + this.featureSwitchEnableLogin = FeatureSwitchUtils.initSwitch( + "fs-enable-login", layoutToUse?.enableUserBadge ?? true, - "Disables/Enables the user information pill (userbadge) at the top left. Disabling this disables logging in and thus disables editing all together, effectively putting MapComplete into read-only mode." + "Disables/Enables logging in and thus disables editing all together. This effectively puts MapComplete into read-only mode." ) this.featureSwitchSearch = FeatureSwitchUtils.initSwitch( "fs-search", @@ -99,11 +98,7 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { layoutToUse?.enableLayers ?? true, "Disables/Enables the filter view" ) - this.featureSwitchAddNew = FeatureSwitchUtils.initSwitch( - "fs-add-new", - layoutToUse?.enableAddNewPoints ?? true, - "Disables/Enables the 'add new feature'-popup. (A theme without presets might not have it in the first place)" - ) + this.featureSwitchWelcomeMessage = FeatureSwitchUtils.initSwitch( "fs-welcome-message", true, @@ -201,12 +196,6 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { ) ) - this.featureSwitchUserbadge.addCallbackAndRun((userbadge) => { - if (!userbadge) { - this.featureSwitchAddNew.setData(false) - } - }) - this.backgroundLayerId = QueryParameters.GetQueryParameter( "background", layoutToUse?.defaultBackgroundId ?? "osm", diff --git a/src/Logic/Web/QueryParameters.ts b/src/Logic/Web/QueryParameters.ts index 208c8e8dd..8d0dd9a1f 100644 --- a/src/Logic/Web/QueryParameters.ts +++ b/src/Logic/Web/QueryParameters.ts @@ -4,14 +4,13 @@ import { UIEventSource } from "../UIEventSource" import Hash from "./Hash" import { Utils } from "../../Utils" -import doc = Mocha.reporters.doc export class QueryParameters { static defaults: Record = {} static documentation: Map = new Map() - private static order: string[] = ["layout", "test", "z", "lat", "lon"] protected static readonly _wasInitialized: Set = new Set() protected static readonly knownSources: Record> = {} + private static order: string[] = ["layout", "test", "z", "lat", "lon"] private static initialized = false public static GetQueryParameter( @@ -74,6 +73,7 @@ export class QueryParameters { this.init() return QueryParameters._wasInitialized.has(key) } + public static initializedParameters(): ReadonlyArray { return Array.from(QueryParameters._wasInitialized.keys()) } @@ -108,14 +108,12 @@ export class QueryParameters { } } - /** - * Set the query parameters of the page location - * @constructor - * @private - */ - private static Serialize() { - const parts = [] + public static GetParts(exclude?: Set) { + const parts: string[] = [] for (const key of QueryParameters.order) { + if (exclude?.has(key)) { + continue + } if (QueryParameters.knownSources[key]?.data === undefined) { continue } @@ -134,6 +132,16 @@ export class QueryParameters { encodeURIComponent(QueryParameters.knownSources[key].data) ) } + return parts + } + + /** + * Set the query parameters of the page location + * @constructor + * @private + */ + private static Serialize() { + const parts = QueryParameters.GetParts() if (!Utils.runningFromConsole) { // Don't pollute the history every time a parameter changes try { @@ -151,4 +159,8 @@ export class QueryParameters { QueryParameters._wasInitialized.clear() QueryParameters.order = [] } + + static GetDefaultFor(key: string): string { + return QueryParameters.defaults[key] + } } diff --git a/src/Logic/Web/ThemeViewStateHashActor.ts b/src/Logic/Web/ThemeViewStateHashActor.ts index a474b029b..b10208f09 100644 --- a/src/Logic/Web/ThemeViewStateHashActor.ts +++ b/src/Logic/Web/ThemeViewStateHashActor.ts @@ -1,9 +1,25 @@ import ThemeViewState from "../../Models/ThemeViewState" import Hash from "./Hash" +import { MenuState } from "../../Models/MenuState" export default class ThemeViewStateHashActor { private readonly _state: ThemeViewState + public static readonly documentation = [ + "The URL-hash can contain multiple values:", + "", + "- The id of the currently selected object, e.g. `node/1234`", + "- The currently opened menu view", + "- The base64-encoded JSON-file specifying a custom theme (only when loading)", + "", + "### Possible hashes to open a menu", + "", + "The possible hashes are:", + "", + MenuState._menuviewTabs.map((tab) => "`menu:" + tab + "`").join(","), + MenuState._themeviewTabs.map((tab) => "`theme-menu:" + tab + "`").join(","), + ] + /** * Converts the hash to the appropriate themeview state and, vice versa, sets the hash. * diff --git a/src/Models/MenuState.ts b/src/Models/MenuState.ts index 3b6aa600a..63dda397c 100644 --- a/src/Models/MenuState.ts +++ b/src/Models/MenuState.ts @@ -50,11 +50,15 @@ export class MenuState { ) public highlightedUserSetting: UIEventSource = new UIEventSource(undefined) - constructor(themeid: string = "") { + constructor(shouldOpenWelcomeMessage: boolean, themeid: string = "") { + // Note: this class is _not_ responsible to update the Hash, @see ThemeViewStateHashActor for this if (themeid) { themeid += "-" } - this.themeIsOpened = LocalStorageSource.GetParsed(themeid + "thememenuisopened", true) + this.themeIsOpened = LocalStorageSource.GetParsed( + themeid + "thememenuisopened", + shouldOpenWelcomeMessage + ) this.themeViewTabIndex = LocalStorageSource.GetParsed(themeid + "themeviewtabindex", 0) this.themeViewTab = this.themeViewTabIndex.sync( (i) => MenuState._themeviewTabs[i], diff --git a/src/Models/ThemeViewState.ts b/src/Models/ThemeViewState.ts index 395c4a7c9..c9471bf5f 100644 --- a/src/Models/ThemeViewState.ts +++ b/src/Models/ThemeViewState.ts @@ -114,15 +114,18 @@ export default class ThemeViewState implements SpecialVisualizationState { constructor(layout: LayoutConfig) { this.layout = layout - this.guistate = new MenuState(layout.id) + this.featureSwitches = new FeatureSwitchState(layout) + this.guistate = new MenuState( + this.featureSwitches.featureSwitchWelcomeMessage.data, + layout.id + ) this.map = new UIEventSource(undefined) const initial = new InitialMapPositioning(layout) this.mapProperties = new MapLibreAdaptor(this.map, initial) const geolocationState = new GeoLocationState() - this.featureSwitches = new FeatureSwitchState(layout) this.featureSwitchIsTesting = this.featureSwitches.featureSwitchIsTesting - this.featureSwitchUserbadge = this.featureSwitches.featureSwitchUserbadge + this.featureSwitchUserbadge = this.featureSwitches.featureSwitchEnableLogin this.osmConnection = new OsmConnection({ dryRun: this.featureSwitches.featureSwitchIsTesting, @@ -469,7 +472,7 @@ export default class ThemeViewState implements SpecialVisualizationState { new ShowDataLayer(this.map, { features: new FilteringFeatureSource(last_click_layer, last_click), - doShowLayer: new ImmutableStore(true), + doShowLayer: this.featureSwitches.featureSwitchEnableLogin, layer: last_click_layer.layerDef, selectedElement: this.selectedElement, selectedLayer: this.selectedLayer, diff --git a/src/UI/BigComponents/ShareScreen.svelte b/src/UI/BigComponents/ShareScreen.svelte new file mode 100644 index 000000000..f17c3553d --- /dev/null +++ b/src/UI/BigComponents/ShareScreen.svelte @@ -0,0 +1,121 @@ + + + +
+ + +
+ {#if typeof navigator?.share === "function"} + + {/if} + {#if navigator.clipboard !== undefined} + + {/if} +
Utils.selectTextIn(e.target)}> + {linkToShare} +
+
+ +
+ + {#if isCopied} + + {/if} +
+ + + + + +
+ + + + + +
+ +
+ <span class="literal-code iframe-code-block">
+ <iframe src="${url}"
+ allow="geolocation" width="100%" height="100%" style="min-width: 250px; min-height: 250px"
+ title="${state.layout.title?.txt ?? "MapComplete" } with MapComplete">
+ </iframe>
+ </span> +
+ +
diff --git a/src/UI/BigComponents/ShareScreen.ts b/src/UI/BigComponents/ShareScreen.ts deleted file mode 100644 index f1956c197..000000000 --- a/src/UI/BigComponents/ShareScreen.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { VariableUiElement } from "../Base/VariableUIElement" -import { Translation } from "../i18n/Translation" -import Svg from "../../Svg" -import Combine from "../Base/Combine" -import { Store, UIEventSource } from "../../Logic/UIEventSource" -import { Utils } from "../../Utils" -import Translations from "../i18n/Translations" -import BaseUIElement from "../BaseUIElement" -import LayerConfig from "../../Models/ThemeConfig/LayerConfig" -import { InputElement } from "../Input/InputElement" -import { CheckBox } from "../Input/Checkboxes" -import { SubtleButton } from "../Base/SubtleButton" -import LZString from "lz-string" -import { SpecialVisualizationState } from "../SpecialVisualization" - -export class ShareScreen extends Combine { - constructor(state: SpecialVisualizationState) { - const layout = state?.layout - const tr = Translations.t.general.sharescreen - - const optionCheckboxes: InputElement[] = [] - const optionParts: Store[] = [] - - const includeLocation = new CheckBox(tr.fsIncludeCurrentLocation, true) - optionCheckboxes.push(includeLocation) - - const currentLocation = state.mapProperties.location - const zoom = state.mapProperties.zoom - - optionParts.push( - includeLocation.GetValue().map( - (includeL) => { - if (currentLocation === undefined) { - return null - } - if (includeL) { - return [ - ["z", zoom.data], - ["lat", currentLocation.data?.lat], - ["lon", currentLocation.data?.lon], - ] - .filter((p) => p[1] !== undefined) - .map((p) => p[0] + "=" + p[1]) - .join("&") - } else { - return null - } - }, - [currentLocation, zoom] - ) - ) - - function fLayerToParam(flayer: { - isDisplayed: UIEventSource - layerDef: LayerConfig - }) { - if (flayer.isDisplayed.data) { - return null // Being displayed is the default - } - return "layer-" + flayer.layerDef.id + "=" + flayer.isDisplayed.data - } - - const currentLayer: Store< - { id: string; name: string | Record } | undefined - > = state.mapProperties.rasterLayer.map((l) => l?.properties) - const currentBackground = new VariableUiElement( - currentLayer.map((layer) => { - return tr.fsIncludeCurrentBackgroundMap.Subs({ name: layer?.name ?? "" }) - }) - ) - const includeCurrentBackground = new CheckBox(currentBackground, true) - optionCheckboxes.push(includeCurrentBackground) - optionParts.push( - includeCurrentBackground.GetValue().map( - (includeBG) => { - if (includeBG) { - return "background=" + currentLayer.data?.id - } else { - return null - } - }, - [currentLayer] - ) - ) - - const includeLayerChoices = new CheckBox(tr.fsIncludeCurrentLayers, true) - optionCheckboxes.push(includeLayerChoices) - - optionParts.push( - includeLayerChoices.GetValue().map( - (includeLayerSelection) => { - if (includeLayerSelection) { - return Utils.NoNull( - Array.from(state.layerState.filteredLayers.values()).map(fLayerToParam) - ).join("&") - } else { - return null - } - }, - Array.from(state.layerState.filteredLayers.values()).map( - (flayer) => flayer.isDisplayed - ) - ) - ) - - const switches = [ - { urlName: "fs-userbadge", human: tr.fsUserbadge }, - { urlName: "fs-search", human: tr.fsSearch }, - { urlName: "fs-welcome-message", human: tr.fsWelcomeMessage }, - { urlName: "fs-layers", human: tr.fsLayers }, - { urlName: "fs-add-new", human: tr.fsAddNew }, - { urlName: "fs-geolocation", human: tr.fsGeolocation }, - ] - - for (const swtch of switches) { - const checkbox = new CheckBox(Translations.W(swtch.human)) - optionCheckboxes.push(checkbox) - optionParts.push( - checkbox.GetValue().map((isEn) => { - if (isEn) { - return null - } else { - return `${swtch.urlName}=false` - } - }) - ) - } - - if (layout.definitionRaw !== undefined) { - optionParts.push(new UIEventSource("userlayout=" + (layout.definedAtUrl ?? layout.id))) - } - - const options = new Combine(optionCheckboxes).SetClass("flex flex-col") - const url = (currentLocation ?? new UIEventSource(undefined)).map(() => { - const host = window.location.host - let path = window.location.pathname - path = path.substr(0, path.lastIndexOf("/")) - let id = layout.id.toLowerCase() - if (layout.definitionRaw !== undefined) { - id = "theme.html" - } - let literalText = `https://${host}${path}/${id}` - - let hash = "" - if (layout.definedAtUrl === undefined && layout.definitionRaw !== undefined) { - hash = "#" + LZString.compressToBase64(Utils.MinifyJSON(layout.definitionRaw)) - } - const parts = Utils.NoEmpty( - Utils.NoNull(optionParts.map((eventSource) => eventSource.data)) - ) - if (parts.length === 0) { - return literalText + hash - } - return literalText + "?" + parts.join("&") + hash - }, optionParts) - - const iframeCode = new VariableUiElement( - url.map((url) => { - return ` - <iframe src="${url}" allow="geolocation" width="100%" height="100%" style="min-width: 250px; min-height: 250px" title="${ - layout.title?.txt ?? "MapComplete" - } with MapComplete"></iframe> - ` - }) - ) - - const linkStatus = new UIEventSource("") - const link = new VariableUiElement( - url.map( - (url) => - `` - ) - ).onClick(async () => { - const shareData = { - title: Translations.W(layout.title)?.ConstructElement().textContent ?? "", - text: Translations.W(layout.description)?.ConstructElement().textContent ?? "", - url: url.data, - } - - function rejected() { - const copyText = document.getElementById("code-link--copyable") - - // @ts-ignore - copyText.select() - // @ts-ignore - copyText.setSelectionRange(0, 99999) /*For mobile devices*/ - - document.execCommand("copy") - const copied = tr.copiedToClipboard.Clone() - copied.SetClass("thanks") - linkStatus.setData(copied) - } - - try { - navigator - .share(shareData) - .then(() => { - const thx = tr.thanksForSharing.Clone() - thx.SetClass("thanks") - linkStatus.setData(thx) - }, rejected) - .catch(rejected) - } catch (err) { - rejected() - } - }) - - let downloadThemeConfig: BaseUIElement = undefined - if (layout.definitionRaw !== undefined) { - const downloadThemeConfigAsJson = new SubtleButton( - Svg.download_svg(), - new Combine([tr.downloadCustomTheme, tr.downloadCustomThemeHelp.SetClass("subtle")]) - .onClick(() => { - Utils.offerContentsAsDownloadableFile( - layout.definitionRaw, - layout.id + ".mapcomplete-theme-definition.json", - { - mimetype: "application/json", - } - ) - }) - .SetClass("flex flex-col") - ) - let editThemeConfig: BaseUIElement = undefined - if (layout.definedAtUrl === undefined) { - const patchedDefinition = JSON.parse(layout.definitionRaw) - patchedDefinition["language"] = Object.keys(patchedDefinition.title) - editThemeConfig = new SubtleButton( - Svg.pencil_svg(), - "Edit this theme on the custom theme generator", - { - url: `https://pietervdvn.github.io/mc/legacy/070/customGenerator.html#${btoa( - JSON.stringify(patchedDefinition) - )}`, - } - ) - } - downloadThemeConfig = new Combine([ - downloadThemeConfigAsJson, - editThemeConfig, - ]).SetClass("flex flex-col") - } - - super([ - tr.intro, - link, - new VariableUiElement(linkStatus), - downloadThemeConfig, - tr.addToHomeScreen, - tr.embedIntro, - options, - iframeCode, - ]) - this.SetClass("flex flex-col link-underline") - } -} diff --git a/src/UI/BigComponents/ThemeIntroPanel.svelte b/src/UI/BigComponents/ThemeIntroPanel.svelte index 60b38a81e..9e58063df 100644 --- a/src/UI/BigComponents/ThemeIntroPanel.svelte +++ b/src/UI/BigComponents/ThemeIntroPanel.svelte @@ -45,9 +45,7 @@ {#if layout.layers.some((l) => l.presets?.length > 0)} - - {/if} diff --git a/src/UI/QueryParameterDocumentation.ts b/src/UI/QueryParameterDocumentation.ts index 4c2255f4b..55956ae54 100644 --- a/src/UI/QueryParameterDocumentation.ts +++ b/src/UI/QueryParameterDocumentation.ts @@ -6,6 +6,7 @@ import Translations from "./i18n/Translations" import { QueryParameters } from "../Logic/Web/QueryParameters" import FeatureSwitchState from "../Logic/State/FeatureSwitchState" import LayoutConfig from "../Models/ThemeConfig/LayoutConfig" +import ThemeViewStateHashActor from "../Logic/Web/ThemeViewStateHashActor" export default class QueryParameterDocumentation { private static QueryParamDocsIntro = [ @@ -60,6 +61,7 @@ export default class QueryParameterDocumentation { public static GenerateQueryParameterDocs(): BaseUIElement { const docs: (string | BaseUIElement)[] = [ ...QueryParameterDocumentation.QueryParamDocsIntro, + ...ThemeViewStateHashActor.documentation, ] this.UrlParamDocs().forEach((value, key) => { const c = new Combine([ diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte index 88fe5c24a..e69d73fd5 100644 --- a/src/UI/ThemeViewGUI.svelte +++ b/src/UI/ThemeViewGUI.svelte @@ -1,57 +1,57 @@ - + diff --git a/index.html b/index.html index b58e3157d..4a29a7026 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,8 @@
- + - + diff --git a/test/CodeQuality.spec.ts b/test/CodeQuality.spec.ts index d1f6eef14..dcf5d27eb 100644 --- a/test/CodeQuality.spec.ts +++ b/test/CodeQuality.spec.ts @@ -1,6 +1,10 @@ import { exec } from "child_process" import { describe, it } from "vitest" +import { parse as parse_html } from "node-html-parser" +import { readFileSync } from "fs" +import ScriptUtils from "../scripts/ScriptUtils" + /** * * @param forbidden: a GREP-regex. This means that '.' is a wildcard and should be escaped to match a literal dot @@ -64,6 +68,32 @@ function itAsync(name: string, promise: Promise) { it(name, wrap(promise)) } +function validateScriptIntegrityOf(path: string) { + const htmlContents = readFileSync(path, "utf8") + const doc = parse_html(htmlContents) + // @ts-ignore + const scripts = Array.from(doc.getElementsByTagName("script")) + for (const script of scripts) { + const src = script.getAttribute("src") + if (src === undefined) { + continue + } + if (src.startsWith("./")) { + // Local script - no check needed + continue + } + const integrity = script.getAttribute("integrity") + const ctx = "Script with source " + src + " in file " + path + if (integrity === undefined) { + throw new Error(ctx + " has no integrity value") + } + const crossorigin = script.getAttribute("crossorigin") + if (crossorigin !== "anonymous") { + throw new Error(ctx + " has crossorigin missing or not set to 'anonymous'") + } + } +} + describe("Code quality", () => { itAsync( "should not contain reverse", @@ -85,17 +115,24 @@ describe("Code quality", () => { "innerText is not allowed as it is not testable with fakeDom. Use 'textContent' instead." ) ) + + it("scripts with external sources should have an integrity hash", () => { + const htmlFiles = ScriptUtils.readDirRecSync(".", 1).filter((f) => f.endsWith(".html")) + for (const htmlFile of htmlFiles) { + validateScriptIntegrityOf(htmlFile) + } + }) /* - itAsync( - "should not contain 'import * as name from \"xyz.json\"'", - detectInCode( - 'import \\* as [a-zA-Z0-9_]\\+ from \\"[.-_/a-zA-Z0-9]\\+\\.json\\"', - "With vite, json files have a default export. Use import name from file.json instead" - ) - ) + itAsync( + "should not contain 'import * as name from \"xyz.json\"'", + detectInCode( + 'import \\* as [a-zA-Z0-9_]\\+ from \\"[.-_/a-zA-Z0-9]\\+\\.json\\"', + "With vite, json files have a default export. Use import name from file.json instead" + ) + ) /* - itAsync( - "should not contain '[\"default\"]'", - detectInCode('\\[\\"default\\"\\]', "Possible leftover of faulty default import") - )*/ + itAsync( + "should not contain '[\"default\"]'", + detectInCode('\\[\\"default\\"\\]', "Possible leftover of faulty default import") + )*/ }) diff --git a/theme.html b/theme.html index 10902c70f..43a5629dc 100644 --- a/theme.html +++ b/theme.html @@ -97,7 +97,7 @@ - + + diff --git a/package-lock.json b/package-lock.json index 8b49afc9a..9d1829c33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.31.2", + "version": "0.31.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.31.2", + "version": "0.31.4", "license": "GPL-3.0-or-later", "dependencies": { "@rgossiaux/svelte-headlessui": "^1.0.2", @@ -40,7 +40,7 @@ "mangrove-reviews-typescript": "^1.1.0", "maplibre-gl": "^3.2.0", "opening_hours": "^3.6.0", - "osm-auth": "^1.0.2", + "osm-auth": "^2.2.0", "osmtogeojson": "^3.0.0-beta.5", "papaparse": "^5.3.1", "pic4carto": "^2.1.15", @@ -7300,17 +7300,6 @@ "node": ">=4" } }, - "node_modules/jshashes": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/jshashes/-/jshashes-1.0.8.tgz", - "integrity": "sha512-btmQZ/w1rj8Lb6nEwvhjM7nBYoj54yaEFo2PWh3RkxZ8qNwuvOxvQYN/JxVuwoMmdIluL+XwYVJ+pEEZoSYybQ==", - "bin": { - "hashes": "bin/hashes" - }, - "engines": { - "node": "*" - } - }, "node_modules/json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", @@ -8189,18 +8178,6 @@ "node": ">= 0.4" } }, - "node_modules/ohauth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ohauth/-/ohauth-1.0.1.tgz", - "integrity": "sha512-R9ZUN3+FVCwzeOOHCJpzA9jw/byRxp5O9X06mTL6Sp/LIQn/rLrMv6cwYctX+hoIKzRUsalGJXZ1kG5wBmSskQ==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dependencies": { - "jshashes": "~1.0.8" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -8372,16 +8349,14 @@ } }, "node_modules/osm-auth": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-1.1.2.tgz", - "integrity": "sha512-oLaU+c/TP7eKAZpBN4S1mv/N94IXp5A+wLpDfAVlpq/b6iikas8ZthXPqhM8QKg/qB8RaKvZPJgxqYS+5m8G8g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-2.2.0.tgz", + "integrity": "sha512-x93jAMaYWqPgfVeOMydFLFpFC8ERnlIKXwiUOrYYWTDEWqq15K/BI5UAjzuYXvLg0WxVxM8YC4N1T30SZeKJBQ==", "dependencies": { - "ohauth": "~1.0.1", - "resolve-url": "~0.2.1", "store": "~2.0.12" }, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/osm-polygon-features": { @@ -9191,12 +9166,6 @@ "protocol-buffers-schema": "^3.3.1" } }, - "node_modules/resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", - "deprecated": "https://github.com/lydell/resolve-url#deprecated" - }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -17830,11 +17799,6 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, - "jshashes": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/jshashes/-/jshashes-1.0.8.tgz", - "integrity": "sha512-btmQZ/w1rj8Lb6nEwvhjM7nBYoj54yaEFo2PWh3RkxZ8qNwuvOxvQYN/JxVuwoMmdIluL+XwYVJ+pEEZoSYybQ==" - }, "json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", @@ -18513,14 +18477,6 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, - "ohauth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ohauth/-/ohauth-1.0.1.tgz", - "integrity": "sha512-R9ZUN3+FVCwzeOOHCJpzA9jw/byRxp5O9X06mTL6Sp/LIQn/rLrMv6cwYctX+hoIKzRUsalGJXZ1kG5wBmSskQ==", - "requires": { - "jshashes": "~1.0.8" - } - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -18651,12 +18607,10 @@ "dev": true }, "osm-auth": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-1.1.2.tgz", - "integrity": "sha512-oLaU+c/TP7eKAZpBN4S1mv/N94IXp5A+wLpDfAVlpq/b6iikas8ZthXPqhM8QKg/qB8RaKvZPJgxqYS+5m8G8g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/osm-auth/-/osm-auth-2.2.0.tgz", + "integrity": "sha512-x93jAMaYWqPgfVeOMydFLFpFC8ERnlIKXwiUOrYYWTDEWqq15K/BI5UAjzuYXvLg0WxVxM8YC4N1T30SZeKJBQ==", "requires": { - "ohauth": "~1.0.1", - "resolve-url": "~0.2.1", "store": "~2.0.12" } }, @@ -19236,11 +19190,6 @@ "protocol-buffers-schema": "^3.3.1" } }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==" - }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", diff --git a/package.json b/package.json index 20ce152ef..bdbeb8cb2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mapcomplete", - "version": "0.31.4", + "version": "0.32.0", "repository": "https://github.com/pietervdvn/MapComplete", "description": "A small website to edit OSM easily", "bugs": "https://github.com/pietervdvn/MapComplete/issues", @@ -93,7 +93,7 @@ "mangrove-reviews-typescript": "^1.1.0", "maplibre-gl": "^3.2.0", "opening_hours": "^3.6.0", - "osm-auth": "^1.0.2", + "osm-auth": "^2.2.0", "osmtogeojson": "^3.0.0-beta.5", "papaparse": "^5.3.1", "pic4carto": "^2.1.15", diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index a14d30849..42c6a9304 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -1,7 +1,9 @@ -import osmAuth from "osm-auth" -import { Store, Stores, UIEventSource } from "../UIEventSource" -import { OsmPreferences } from "./OsmPreferences" -import { Utils } from "../../Utils" +// @ts-ignore +import {osmAuth} from "osm-auth" +import {Store, Stores, UIEventSource} from "../UIEventSource" +import {OsmPreferences} from "./OsmPreferences" +import {Utils} from "../../Utils" +import {LocalStorageSource} from "../Web/LocalStorageSource"; export default class UserDetails { public loggedIn = false @@ -22,22 +24,26 @@ export default class UserDetails { } } +export interface AuthConfig { + oauth_client_id: string + oauth_secret: string + url: string +} + export type OsmServiceState = "online" | "readonly" | "offline" | "unknown" | "unreachable" export class OsmConnection { - public static readonly oauth_configs = { + public static readonly oauth_configs: Record = { osm: { - oauth_consumer_key: "hivV7ec2o49Two8g9h8Is1VIiVOgxQ1iYexCbvem", - oauth_secret: "wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI", + oauth_client_id: 'sa1ngLJBJ8McmzHElN8NYtIDm5TZTYEYhq3-0snO4Qc', + oauth_secret: 'XU_cD5Mvw9VKk9T0t_gO8V7cbRC4Hmw2Tb4Rv0Zmz-U', url: "https://www.openstreetmap.org", - // OAUTH 1.0 application - // https://www.openstreetmap.org/user/Pieter%20Vander%20Vennet/oauth_clients/7404 }, "osm-test": { - oauth_consumer_key: "Zgr7EoKb93uwPv2EOFkIlf3n9NLwj5wbyfjZMhz2", - oauth_secret: "3am1i1sykHDMZ66SGq4wI2Z7cJMKgzneCHp3nctn", - url: "https://master.apis.dev.openstreetmap.org", - }, + oauth_client_id: "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU" + oauth_secret: "luFZtPJg7j96K6WM6RpcZ_3M-r6muuDq6fG1ygk0I_4", + url: "https://master.apis.dev.openstreetmap.org", + } } public auth public userDetails: UIEventSource @@ -53,11 +59,7 @@ export class OsmConnection { "not-attempted" ) public preferencesHandler: OsmPreferences - public readonly _oauth_config: { - oauth_consumer_key: string - oauth_secret: string - url: string - } + public readonly _oauth_config: AuthConfig private readonly _dryRun: Store private fakeUser: boolean private _onLoggedIn: ((userDetails: UserDetails) => void)[] = [] @@ -190,6 +192,7 @@ export class OsmConnection { const self = this console.log("Trying to log in...") this.updateAuthObject() + LocalStorageSource.Get("location_before_login").setData(window.location.href) this.auth.xhr( { method: "GET", @@ -202,13 +205,8 @@ export class OsmConnection { if (err.status == 401) { console.log("Clearing tokens...") // Not authorized - our token probably got revoked - // Reset all the tokens - const tokens = [ - "https://www.openstreetmap.orgoauth_request_token_secret", - "https://www.openstreetmap.orgoauth_token", - "https://www.openstreetmap.orgoauth_token_secret", - ] - tokens.forEach((token) => localStorage.removeItem(token)) + self.auth.logout(); + self.LogOut() } return } @@ -252,7 +250,7 @@ export class OsmConnection { if (homeEl !== undefined && homeEl[0] !== undefined) { const lat = parseFloat(homeEl[0].getAttribute("lat")) const lon = parseFloat(homeEl[0].getAttribute("lon")) - data.home = { lat: lat, lon: lon } + data.home = {lat: lat, lon: lon} } self.loadingStatus.setData("logged-in") @@ -310,6 +308,7 @@ export class OsmConnection { ): Promise { return await this.interact(path, "POST", header, content) } + public async put( path: string, content?: string, @@ -355,13 +354,13 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually opening note with text ", text) return new Promise<{ id: number }>((ok) => { window.setTimeout( - () => ok({ id: Math.floor(Math.random() * 1000) }), + () => ok({id: Math.floor(Math.random() * 1000)}), Math.random() * 5000 ) }) } const auth = this.auth - const content = { lat, lon, text } + const content = {lat, lon, text} const response = await this.post("notes.json", JSON.stringify(content), { "Content-Type": "application/json", }) @@ -389,7 +388,7 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually uploading GPX ", gpx) return new Promise<{ id: number }>((ok, error) => { window.setTimeout( - () => ok({ id: Math.floor(Math.random() * 1000) }), + () => ok({id: Math.floor(Math.random() * 1000)}), Math.random() * 5000 ) }) @@ -430,7 +429,7 @@ export class OsmConnection { }) const parsed = JSON.parse(response) console.log("Uploaded GPX track", parsed) - return { id: parsed } + return {id: parsed} } public addCommentToNote(id: number | string, text: string): Promise { @@ -486,15 +485,27 @@ export class OsmConnection { // Same for an iframe... this.auth = new osmAuth({ - oauth_consumer_key: this._oauth_config.oauth_consumer_key, - oauth_secret: this._oauth_config.oauth_secret, + client_id: this._oauth_config.oauth_client_id, url: this._oauth_config.url, - landing: standalone ? undefined : window.location.href, + scope: "read_prefs write_prefs write_api write_gpx write_notes", + redirect_uri: window.location.protocol + "//" + window.location.host + "/land.html", singlepage: !standalone, auto: true, }) } + /** + * To be called by land.html + */ + public finishLogin(callback: ((previousURL: string) => void)) { + this.auth.authenticate(function() { + // Fully authed at this point + console.log("Authentication successful!") + const previousLocation = LocalStorageSource.Get("location_before_login") + callback(previousLocation.data) + }); + } + private CheckForMessagesContinuously() { const self = this if (this.isChecking) { @@ -511,7 +522,7 @@ export class OsmConnection { private UpdateCapabilities(): void { const self = this - this.FetchCapabilities().then(({ api, gpx }) => { + this.FetchCapabilities().then(({api, gpx}) => { self.apiIsOnline.setData(api) self.gpxServiceIsOnline.setData(gpx) }) @@ -519,18 +530,18 @@ export class OsmConnection { private async FetchCapabilities(): Promise<{ api: OsmServiceState; gpx: OsmServiceState }> { if (Utils.runningFromConsole) { - return { api: "online", gpx: "online" } + return {api: "online", gpx: "online"} } const result = await Utils.downloadAdvanced(this.Backend() + "/api/0.6/capabilities") if (result["content"] === undefined) { console.log("Something went wrong:", result) - return { api: "unreachable", gpx: "unreachable" } + return {api: "unreachable", gpx: "unreachable"} } const xmlRaw = result["content"] const parsed = new DOMParser().parseFromString(xmlRaw, "text/xml") const statusEl = parsed.getElementsByTagName("status")[0] const api = statusEl.getAttribute("api") const gpx = statusEl.getAttribute("gpx") - return { api, gpx } + return {api, gpx} } } diff --git a/src/land.ts b/src/land.ts new file mode 100644 index 000000000..18ceedea4 --- /dev/null +++ b/src/land.ts @@ -0,0 +1,12 @@ +import {OsmConnection} from "./Logic/Osm/OsmConnection"; + +console.log("Authorizing..."); +new OsmConnection().finishLogin(previousURL => { + const fallback = window.location.protocol+"//"+window.location.host+"/index.html" + previousURL ??= fallback + if(previousURL.indexOf("/land") > 0){ + previousURL = fallback + } + console.log("Redirecting to", previousURL) + window.location.href = previousURL +}) From 752de107ab6a50f8e513b0c7307b44dc6094d974 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 1 Sep 2023 21:39:40 +0200 Subject: [PATCH 117/134] Fix: typo --- src/Logic/Osm/OsmConnection.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 42c6a9304..557a1a7fa 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -40,7 +40,7 @@ export class OsmConnection { url: "https://www.openstreetmap.org", }, "osm-test": { - oauth_client_id: "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU" + oauth_client_id: "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU", oauth_secret: "luFZtPJg7j96K6WM6RpcZ_3M-r6muuDq6fG1ygk0I_4", url: "https://master.apis.dev.openstreetmap.org", } From fc9dd462399a3b7ed8959c38c4a97f24895f9ca8 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 1 Sep 2023 22:31:46 +0200 Subject: [PATCH 118/134] Fix: fix tests; use OAuth client id from dedicated MapComplete account --- src/Logic/Osm/OsmConnection.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 557a1a7fa..9e689a07c 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -34,11 +34,18 @@ export type OsmServiceState = "online" | "readonly" | "offline" | "unknown" | "u export class OsmConnection { public static readonly oauth_configs: Record = { - osm: { + osm_pietervdvn: { + // This client_id is registered by "Pieter Vander Vennet" on OSM.org oauth_client_id: 'sa1ngLJBJ8McmzHElN8NYtIDm5TZTYEYhq3-0snO4Qc', oauth_secret: 'XU_cD5Mvw9VKk9T0t_gO8V7cbRC4Hmw2Tb4Rv0Zmz-U', url: "https://www.openstreetmap.org", }, + osm: { + // This client-id is registered by "MapComplete" on osm.org + oauth_client_id: "K93H1d8ve7p-tVLE1ZwsQ4lAFLQk8INx5vfTLMu5DWk", + oauth_secret: "NBWGhWDrD3QDB35xtVuxv4aExnmIt4FA_WgeLtwxasg", + url: "https://www.openstreetmap.org", + }, "osm-test": { oauth_client_id: "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU", oauth_secret: "luFZtPJg7j96K6WM6RpcZ_3M-r6muuDq6fG1ygk0I_4", @@ -192,7 +199,7 @@ export class OsmConnection { const self = this console.log("Trying to log in...") this.updateAuthObject() - LocalStorageSource.Get("location_before_login").setData(window.location.href) + LocalStorageSource.Get("location_before_login").setData(Utils.runningFromConsole ? undefined : window.location.href) this.auth.xhr( { method: "GET", @@ -488,7 +495,7 @@ export class OsmConnection { client_id: this._oauth_config.oauth_client_id, url: this._oauth_config.url, scope: "read_prefs write_prefs write_api write_gpx write_notes", - redirect_uri: window.location.protocol + "//" + window.location.host + "/land.html", + redirect_uri: Utils.runningFromConsole ? "https://mapcomplete.org/land.html" : window.location.protocol + "//" + window.location.host + "/land.html", singlepage: !standalone, auto: true, }) From 4d01d81e1e87ca5a18b6d0fd7b9f232c77cda936 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 00:02:23 +0200 Subject: [PATCH 119/134] Fix: correctly escape markdown --- src/UI/Base/Table.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/Base/Table.ts b/src/UI/Base/Table.ts index e27dbff89..c400b9129 100644 --- a/src/UI/Base/Table.ts +++ b/src/UI/Base/Table.ts @@ -29,7 +29,7 @@ export default class Table extends BaseUIElement { const header = Utils.NoNull(headerMarkdownParts).join(" | ") const headerSep = headerMarkdownParts.map((part) => "-".repeat(part.length + 2)).join(" | ") const table = this._contents - .map((row) => row.map((el) => el?.AsMarkdown()?.replace("|", "\\|") ?? " ").join(" | ")) + .map((row) => row.map((el) => el?.AsMarkdown()?.replaceAll("\\","\\\\")?.replaceAll("|", "\\|") ?? " ").join(" | ")) .join("\n") return "\n\n" + [header, headerSep, table, ""].join("\n") From f207736e404cd7cc06d21d4d747688ea4c6c251b Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 00:07:47 +0200 Subject: [PATCH 120/134] Refactoring: move constants into package.json --- package.json | 39 +++++++++++++++++++++++++++++++++ src/Logic/Osm/OsmConnection.ts | 23 +++---------------- src/Models/Constants.ts | 21 +++++------------- src/UI/Image/ImageUploadFlow.ts | 2 +- 4 files changed, 49 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index bdbeb8cb2..ff3e61eeb 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,45 @@ "homepage": "https://mapcomplete.org", "main": "index.ts", "type": "module", + "config": { + "#": "Various endpoints that are instance-specific", + "#oauth_credentials:comment": [ + "`oauth_credentials` are the OAuth-2 credentials for the production-OSM server and the test-server.", + "Are you deploying your own instance? Register your application too.", + "See https://wiki.openstreetmap.org/wiki/OAuth#Registering_your_application_as_OAuth_2.0_consumer for instructions", + "Use `https:////land.html` as redirect URIs. You can add `http://127.0.0.1:1234/land.html` too for local development." + ], + "oauth_credentials": { + "osm_pietervdvn": { + "#": "This client_id is registered by 'Pieter Vander Vennet' on OSM.org", + "oauth_client_id": "sa1ngLJBJ8McmzHElN8NYtIDm5TZTYEYhq3-0snO4Qc", + "oauth_secret": "XU_cD5Mvw9VKk9T0t_gO8V7cbRC4Hmw2Tb4Rv0Zmz-U", + "url": "https://www.openstreetmap.org" + }, + "osm": { + "#": "This client-id is registered by 'MapComplete' on osm.org", + "oauth_client_id": "K93H1d8ve7p-tVLE1ZwsQ4lAFLQk8INx5vfTLMu5DWk", + "oauth_secret": "NBWGhWDrD3QDB35xtVuxv4aExnmIt4FA_WgeLtwxasg", + "url": "https://www.openstreetmap.org" + }, + "osm-test": { + "oauth_client_id": "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU", + "oauth_secret": "luFZtPJg7j96K6WM6RpcZ_3M-r6muuDq6fG1ygk0I_4", + "url": "https://master.apis.dev.openstreetmap.org" + } + }, + "api_keys": { + "#": "Various API-keys for various services. Feel free to reuse those in another MapComplete-hosted version", + "imgur": "7070e7167f0a25a", + "mapillary_v4": "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" + }, + "default_overpass_urls": [ + "https://overpass-api.de/api/interpreter", + "https://overpass.kumi.systems/api/interpreter", + "https://overpass.openstreetmap.ru/cgi/interpreter" + ], + "country_coder_host": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/latlon2country" + }, "scripts": { "start": "npm run generate:layeroverview && npm run strt", "strt": "vite --host", diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 9e689a07c..76c419761 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -4,7 +4,7 @@ import {Store, Stores, UIEventSource} from "../UIEventSource" import {OsmPreferences} from "./OsmPreferences" import {Utils} from "../../Utils" import {LocalStorageSource} from "../Web/LocalStorageSource"; - +import * as config from "../../../package.json" export default class UserDetails { public loggedIn = false public name = "Not logged in" @@ -25,6 +25,7 @@ export default class UserDetails { } export interface AuthConfig { + "#"?: string // optional comment oauth_client_id: string oauth_secret: string url: string @@ -33,25 +34,7 @@ export interface AuthConfig { export type OsmServiceState = "online" | "readonly" | "offline" | "unknown" | "unreachable" export class OsmConnection { - public static readonly oauth_configs: Record = { - osm_pietervdvn: { - // This client_id is registered by "Pieter Vander Vennet" on OSM.org - oauth_client_id: 'sa1ngLJBJ8McmzHElN8NYtIDm5TZTYEYhq3-0snO4Qc', - oauth_secret: 'XU_cD5Mvw9VKk9T0t_gO8V7cbRC4Hmw2Tb4Rv0Zmz-U', - url: "https://www.openstreetmap.org", - }, - osm: { - // This client-id is registered by "MapComplete" on osm.org - oauth_client_id: "K93H1d8ve7p-tVLE1ZwsQ4lAFLQk8INx5vfTLMu5DWk", - oauth_secret: "NBWGhWDrD3QDB35xtVuxv4aExnmIt4FA_WgeLtwxasg", - url: "https://www.openstreetmap.org", - }, - "osm-test": { - oauth_client_id: "HwUn6GPxGm1m9WwMarxTglhy6dBTM4YkaV1I9h6pDGU", - oauth_secret: "luFZtPJg7j96K6WM6RpcZ_3M-r6muuDq6fG1ygk0I_4", - url: "https://master.apis.dev.openstreetmap.org", - } - } + public static readonly oauth_configs: Record = config.config.oauth_credentials public auth public userDetails: UIEventSource public isLoggedIn: Store diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index ad7e9a62d..0ab2ea2e6 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -6,9 +6,8 @@ export type PriviligedLayerType = (typeof Constants.priviliged_layers)[number] export default class Constants { public static vNumber = meta.version - public static ImgurApiKey = "7070e7167f0a25a" - public static readonly mapillary_client_token_v4 = - "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" + public static ImgurApiKey = meta.config.api_keys.imgur + public static readonly mapillary_client_token_v4 =meta.config.api_keys.mapillary_v4 /** * API key for Maproulette @@ -19,15 +18,7 @@ export default class Constants { */ public static readonly MaprouletteApiKey = "" - public static defaultOverpassUrls = [ - // The official instance, 10000 queries per day per project allowed - "https://overpass-api.de/api/interpreter", - // 'Fair usage' - "https://overpass.kumi.systems/api/interpreter", - // Offline: "https://overpass.nchc.org.tw/api/interpreter", - "https://overpass.openstreetmap.ru/cgi/interpreter", - // Doesn't support nwr: "https://overpass.openstreetmap.fr/api/interpreter" - ] + public static defaultOverpassUrls = meta.config.default_overpass_urls public static readonly added_by_default = [ "selected_element", @@ -100,6 +91,7 @@ export default class Constants { "etymology", "food", "cafes_and_pubs", + "shops", "playgrounds", "hailhydrant", "toilets", @@ -113,9 +105,8 @@ export default class Constants { * In seconds */ static zoomToLocationTimeout = 15 - static countryCoderEndpoint: string = - "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/latlon2country" - public static readonly OsmPreferenceKeyPicturesLicense = "pictures-license" + static countryCoderEndpoint: string = meta.config.country_coder_host + /** * These are the values that are allowed to use as 'backdrop' icon for a map pin */ diff --git a/src/UI/Image/ImageUploadFlow.ts b/src/UI/Image/ImageUploadFlow.ts index 250df538d..f5ce9772d 100644 --- a/src/UI/Image/ImageUploadFlow.ts +++ b/src/UI/Image/ImageUploadFlow.ts @@ -73,7 +73,7 @@ export class ImageUploadFlow extends Toggle { ]).SetClass("w-full flex justify-center items-center") const licenseStore = state?.osmConnection?.GetPreference( - Constants.OsmPreferenceKeyPicturesLicense, + "pictures-license", "CC0" ) From 7aee442ae49a7a68821917de9580ce9e62105edf Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 00:46:17 +0200 Subject: [PATCH 121/134] Fix: improve first-sentence --- src/UI/i18n/Translation.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/UI/i18n/Translation.ts b/src/UI/i18n/Translation.ts index d55fb9604..7a8eb6be3 100644 --- a/src/UI/i18n/Translation.ts +++ b/src/UI/i18n/Translation.ts @@ -226,16 +226,26 @@ export class Translation extends BaseUIElement { return new Translation(this.translations, this.context) } - FirstSentence() { + /** + * Build a new translation which only contains the first sentence of every language + * A sentence stops at either a dot (`.`) or a HTML-break ('
'). + * The dot or linebreak are _not_ returned. + * + * new Translation({"en": "This is a sentence. This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence" + * new Translation({"en": "This is a sentence
This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence" + * new Translation({"en": "This is a sentence with a bold word. This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence with a bold word" + * @constructor + */ + public FirstSentence(): Translation { const tr = {} for (const lng in this.translations) { if (!this.translations.hasOwnProperty(lng)) { continue } let txt = this.translations[lng] - txt = txt.replace(/[.<].*/, "") + txt = txt.replace(/(\.|).*/, "") txt = Utils.EllipsesAfter(txt, 255) - tr[lng] = txt + tr[lng] = txt.trim() } return new Translation(tr) From fd39f66e2e4a4b190f0656e0379a6d078d36c38d Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 00:49:40 +0200 Subject: [PATCH 122/134] chore: translation sync --- langs/layers/en.json | 23 +++++++++++++++++++++++ langs/layers/nl.json | 20 ++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/langs/layers/en.json b/langs/layers/en.json index 75018983d..a290fad1b 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -6883,6 +6883,20 @@ } }, "tagRenderings": { + "has_atm": { + "mappings": { + "0": { + "then": "This post office has an ATM" + }, + "1": { + "then": "This post office does not have an ATM" + }, + "2": { + "then": "This post office does have an ATM, but it is mapped as a different icon" + } + }, + "question": "Does this post office have an ATM?" + }, "letter-from": { "mappings": { "0": { @@ -9812,6 +9826,15 @@ }, "15": { "then": "Flowers are sold" + }, + "16": { + "then": "Parking tickets are sold" + }, + "17": { + "then": "Pressed pennies are sold" + }, + "18": { + "then": "Public transport tickets are sold" } }, "question": "What does this vending machine sell?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 7e2b0e43c..87d066050 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6461,6 +6461,20 @@ } }, "tagRenderings": { + "has_atm": { + "mappings": { + "0": { + "then": "Dit postkantoor heeft een bankautomaat" + }, + "1": { + "then": "Dit postkantoor heeft geen bankautomaaat" + }, + "2": { + "then": "Dit postkantoor heeft een bankautomaat, maar deze staat apart op de kaart aangeduid" + } + }, + "question": "Heeft dit postkantoor een bankautomaat?" + }, "letter-from": { "mappings": { "0": { @@ -9074,6 +9088,12 @@ }, "15": { "then": "Bloemen worden verkocht" + }, + "16": { + "then": "Parkeerkaarten worden verkocht" + }, + "18": { + "then": "Openbaar vervoerkaartjes worden verkocht" } }, "question": "Wat verkoopt deze verkoopautomaat?", From d9b8257e47f7c2e2ce06e4a0fcad8830764dae8e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 00:55:07 +0200 Subject: [PATCH 123/134] Fix: fix reverse tabnabbing in most cases, add rel=noopener to most links to untrusted content --- assets/layers/ghost_bike/ghost_bike.json | 22 ++-- assets/layers/icons/icons.json | 10 +- .../public_bookcase/public_bookcase.json | 20 +-- .../mapcomplete-changes.json | 114 +++++++++++++----- langs/layers/ca.json | 6 +- langs/layers/de.json | 12 +- langs/layers/en.json | 12 +- langs/layers/fr.json | 12 +- langs/layers/hu.json | 6 +- langs/layers/id.json | 6 +- langs/layers/it.json | 12 +- langs/layers/nl.json | 12 +- langs/layers/ru.json | 12 +- langs/themes/de.json | 106 ++++++++++++++++ langs/themes/en.json | 12 +- langs/themes/fr.json | 59 +++++++++ langs/themes/nl.json | 83 +++++++++++++ scripts/GenerateSeries.ts | 6 +- src/Models/Constants.ts | 7 +- src/Models/ThemeConfig/TagRenderingConfig.ts | 2 +- src/UI/Base/SubtleLink.svelte | 1 + src/UI/BigComponents/ContactLink.svelte | 2 +- src/UI/BigComponents/CopyrightPanel.ts | 2 +- src/UI/BigComponents/UserProfile.svelte | 1 + src/UI/SpecialVisualizations.ts | 2 +- 25 files changed, 462 insertions(+), 77 deletions(-) diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index ce46418d5..3bb2ab11b 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -184,14 +184,20 @@ "ca": "En quina pàgina web es pot trobar més informació sobre la bicicleta blanca o l'accident?" }, "render": { - "en": "More info available", - "nl": "Meer informatie", - "de": "Mehr Informationen", - "it": "Sono disponibili ulteriori informazioni", - "ru": "Доступна более подробная информация", - "fr": "Plus d'informations sont disponibles", - "id": "Informasi lanjut tersedia", - "ca": "Més informació disponible" + "special": { + "type": "link", + "href": "{source}", + "text": { + "en": "More info available", + "nl": "Meer informatie", + "de": "Mehr Informationen", + "it": "Sono disponibili ulteriori informazioni", + "ru": "Доступна более подробная информация", + "fr": "Plus d'informations sont disponibles", + "id": "Informasi lanjut tersedia", + "ca": "Més informació disponible" + } + } }, "freeform": { "type": "url", diff --git a/assets/layers/icons/icons.json b/assets/layers/icons/icons.json index c5633b74a..f3b781152 100644 --- a/assets/layers/icons/icons.json +++ b/assets/layers/icons/icons.json @@ -12,7 +12,7 @@ "labels": [ "defaults" ], - "render": "Wikipedia", + "render": "Wikipedia", "condition": { "or": [ "wikipedia~*", @@ -23,7 +23,7 @@ { "#": "ignore-image-in-then", "if": "wikipedia=", - "then": "WD" + "then": "WD" } ] }, @@ -106,7 +106,7 @@ "labels": [ "defaults" ], - "render": "website", + "render": "website", "condition": "website~*" }, { @@ -140,7 +140,7 @@ "labels": [ "defaults" ], - "render": "on osm", + "render": "on osm", "mappings": [ { "if": "id~.*/-.*", @@ -149,7 +149,7 @@ { "#": "ignore-image-in-then", "if": "_backend~*", - "then": "" + "then": "" } ], "condition": "id~(node|way|relation)/[0-9]*" diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 4ee12d8e0..c8a0df017 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -438,13 +438,19 @@ }, { "render": { - "en": "More info on the website", - "nl": "Meer info op de website", - "de": "Weitere Informationen auf der Webseite", - "fr": "Plus d'infos sur le site web", - "ru": "Более подробная информация на сайте", - "it": "Maggiori informazioni sul sito web", - "hu": "További információ ezen a weboldalon" + "special": { + "type": "link", + "href": "{website}", + "text": { + "en": "More info on the website", + "nl": "Meer info op de website", + "de": "Weitere Informationen auf der Webseite", + "fr": "Plus d'infos sur le site web", + "ru": "Более подробная информация на сайте", + "it": "Maggiori informazioni sul sito web", + "hu": "További információ ezen a weboldalon" + } + } }, "question": { "en": "Is there a website with more information about this public bookcase?", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index dabbec8e1..3bd0b3b29 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,21 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "fr": "Changements faits avec MapComplete", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "fr": "Cette carte montre tous les changements faits avec MapComplete", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +28,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +41,57 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}", + "fr": "Groupe de modifications pour {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}", + "fr": "Groupe de modifications {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "fr": "Quel contributeur a fait cette modification ?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "fr": "Modification faite par {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?", + "fr": "Quel thème a été utilisé pour faire cette modification ?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}", + "fr": "Modifié avec le thème {theme}" } }, { @@ -74,19 +100,29 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "fr": "En quelle langue est-ce que ce changement a été fait ?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "fr": "Modification faite avec {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +143,14 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "fr": "Quelle version de MapComplete a été utilisée pour faire cette modification ?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}", + "fr": "Fait avec {editor}" }, "freeform": { "key": "editor" @@ -452,7 +492,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +510,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +528,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +547,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +566,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +584,10 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "fr": "Langage utilisateur (code-ISO) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +603,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +616,10 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "fr": "Le groupe de modifications a ajouté au moins une image", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +634,9 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier", + "fr": "D'autres statistiques sont disponibles ici" } }, { @@ -606,4 +666,4 @@ } } ] -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 2173159a3..de8bc86b5 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -3160,7 +3160,11 @@ }, "ghost_bike-source": { "question": "En quina pàgina web es pot trobar més informació sobre la bicicleta blanca o l'accident?", - "render": "Més informació disponible" + "render": { + "special": { + "text": "Més informació disponible" + } + } } }, "title": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 8f844fa1b..894e1a797 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5151,7 +5151,11 @@ }, "ghost_bike-source": { "question": "Auf welcher Webseite kann man mehr Informationen über das Geisterrad oder den Unfall finden?", - "render": "Mehr Informationen" + "render": { + "special": { + "text": "Mehr Informationen" + } + } }, "ghost_bike-start_date": { "question": "Wann wurde dieses Geisterrad aufgestellt?", @@ -7101,7 +7105,11 @@ }, "public_bookcase-website": { "question": "Auf welcher Webseite findet man Informationen zu diesem Bücherschrank?", - "render": "Weitere Informationen auf der Webseite" + "render": { + "special": { + "text": "Weitere Informationen auf der Webseite" + } + } } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index a290fad1b..e3acffc5d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5171,7 +5171,11 @@ }, "ghost_bike-source": { "question": "On what webpage can one find more info about the ghost bike or the accident?", - "render": "More info available" + "render": { + "special": { + "text": "More info available" + } + } }, "ghost_bike-start_date": { "question": "When was this Ghost bike installed?", @@ -7135,7 +7139,11 @@ }, "public_bookcase-website": { "question": "Is there a website with more information about this public bookcase?", - "render": "More info on the website" + "render": { + "special": { + "text": "More info on the website" + } + } } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 4dcce7098..fa04bb6b7 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -3584,7 +3584,11 @@ }, "ghost_bike-source": { "question": "Sur quelle page web peut-on trouver plus d'informations sur le Vélo fantôme ou l'accident ?", - "render": "Plus d'informations sont disponibles" + "render": { + "special": { + "text": "Plus d'informations sont disponibles" + } + } }, "ghost_bike-start_date": { "question": "Quand ce vélo fantôme a-t-il été installée ?", @@ -4265,7 +4269,11 @@ }, "public_bookcase-website": { "question": "Y a-t-il un site web avec plus d'informations sur cette microbibliothèque ?", - "render": "Plus d'infos sur le site web" + "render": { + "special": { + "text": "Plus d'infos sur le site web" + } + } } }, "title": { diff --git a/langs/layers/hu.json b/langs/layers/hu.json index 033b17ec5..1b2e6ef41 100644 --- a/langs/layers/hu.json +++ b/langs/layers/hu.json @@ -752,7 +752,11 @@ }, "public_bookcase-website": { "question": "Van-e olyan weboldal, ahol további információ található erről a nyilvános könyvespolcról?", - "render": "További információ ezen a weboldalon" + "render": { + "special": { + "text": "További információ ezen a weboldalon" + } + } } }, "title": { diff --git a/langs/layers/id.json b/langs/layers/id.json index 950dc3170..fc28c3edf 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -341,7 +341,11 @@ "render": "{inscription}" }, "ghost_bike-source": { - "render": "Informasi lanjut tersedia" + "render": { + "special": { + "text": "Informasi lanjut tersedia" + } + } } } }, diff --git a/langs/layers/it.json b/langs/layers/it.json index ea7d06fcc..d3066d329 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1344,7 +1344,11 @@ }, "ghost_bike-source": { "question": "In quale pagina web si possono trovare informazioni sulla bici fantasma o l’incidente?", - "render": "Sono disponibili ulteriori informazioni" + "render": { + "special": { + "text": "Sono disponibili ulteriori informazioni" + } + } }, "ghost_bike-start_date": { "question": "Quando è stata installata questa bici fantasma?", @@ -1759,7 +1763,11 @@ }, "public_bookcase-website": { "question": "C'è un sito web con maggiori informazioni su questa microbiblioteca?", - "render": "Maggiori informazioni sul sito web" + "render": { + "special": { + "text": "Maggiori informazioni sul sito web" + } + } } }, "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 87d066050..6a602b03f 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4851,7 +4851,11 @@ }, "ghost_bike-source": { "question": "Op welke website kan men meer informatie vinden over de Witte fiets of over het ongeval?", - "render": "Meer informatie" + "render": { + "special": { + "text": "Meer informatie" + } + } }, "ghost_bike-start_date": { "question": "Wanneer werd deze witte fiets geplaatst?", @@ -6667,7 +6671,11 @@ }, "public_bookcase-website": { "question": "Is er een website over dit boekenruilkastje?", - "render": "Meer info op de website" + "render": { + "special": { + "text": "Meer info op de website" + } + } } }, "title": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index a320c85f5..e2b6cbb1b 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -996,7 +996,11 @@ "render": "В знак памяти о {subject}" }, "ghost_bike-source": { - "render": "Доступна более подробная информация" + "render": { + "special": { + "text": "Доступна более подробная информация" + } + } }, "ghost_bike-start_date": { "render": "Установлен {start_date}" @@ -1515,7 +1519,11 @@ }, "public_bookcase-website": { "question": "Есть ли веб-сайт с более подробной информацией об этом общественном книжном шкафе?", - "render": "Более подробная информация на сайте" + "render": { + "special": { + "text": "Более подробная информация на сайте" + } + } } }, "title": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 6052fc55f..e64d44abe 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -854,6 +854,112 @@ }, "title": "Bordsteine und Überwege" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "layers": { + "0": { + "description": "Alle MapComplete-Änderungen anzeigen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Erstellt vor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Erstellt nach {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Benutzersprache (ISO-Code) {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Erstellt mit Host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset fügte mindestens ein Bild hinzu" + } + } + } + }, + "name": "Zentrum der Änderungssätze", + "tagRenderings": { + "contributor": { + "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "render": "Änderung gemacht von {user}" + }, + "host": { + "question": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "render": "Änderung vorgenommen mit {host}" + }, + "locale": { + "question": "In welcher Sprache wurde diese Änderung vorgenommen?", + "render": "Usersprache ist {locale}" + }, + "show_changeset_id": { + "render": "Änderungssatz {id}" + }, + "theme-id": { + "question": "Welches Thema wurde für diese Änderung verwendet?", + "render": "Geändert mit Thema {theme}" + }, + "version": { + "question": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "render": "Erstellt mit {editor}" + } + }, + "title": { + "render": "Änderungssatz für {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "Mehr Statistiken gibt es hier" + } + } + } + } + }, + "shortDescription": "Mit MapComplete erstellte Änderungen anzeigen", + "title": "Mit MapComplete erstellte Änderungen" + }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/en.json b/langs/themes/en.json index ca9c5a4f9..d07b53164 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -858,12 +858,12 @@ "description": "This maps shows all the changes made with MapComplete", "layers": { "0": { - "description": "Shows all MapComplete changes", + "description": "Show all MapComplete changes", "filter": { "0": { "options": { "0": { - "question": "Themename contains {search}" + "question": "Theme name contains {search}" } } }, @@ -920,12 +920,12 @@ "name": "Changeset centers", "tagRenderings": { "contributor": { - "question": "What contributor did make this change?", + "question": "Which contributor made this change?", "render": "Change made by {user}" }, "host": { "question": "What host (website) was this change made with?", - "render": "Change with with {host}" + "render": "Change made with {host}" }, "locale": { "question": "What locale (language) was this change made in?", @@ -936,7 +936,7 @@ }, "theme-id": { "question": "What theme was used to make this change?", - "render": "Change with theme {theme}" + "render": "Change with theme {theme}" }, "version": { "question": "What version of MapComplete was used to make this change?", @@ -957,7 +957,7 @@ } } }, - "shortDescription": "Shows changes made by MapComplete", + "shortDescription": "Show changes made with MapComplete", "title": "Changes made with MapComplete" }, "maproulette": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 1154031d0..21da83331 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -844,6 +844,65 @@ }, "title": "Ressauts et traversées" }, + "mapcomplete-changes": { + "description": "Cette carte montre tous les changements faits avec MapComplete", + "layers": { + "0": { + "filter": { + "5": { + "options": { + "0": { + "question": "Langage utilisateur (code-ISO) {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Le groupe de modifications a ajouté au moins une image" + } + } + } + }, + "tagRenderings": { + "contributor": { + "question": "Quel contributeur a fait cette modification ?", + "render": "Modification faite par {user}" + }, + "host": { + "render": "Modification faite avec {host}" + }, + "locale": { + "question": "En quelle langue est-ce que ce changement a été fait ?" + }, + "show_changeset_id": { + "render": "Groupe de modifications {id}" + }, + "theme-id": { + "question": "Quel thème a été utilisé pour faire cette modification ?", + "render": "Modifié avec le thème {theme}" + }, + "version": { + "question": "Quelle version de MapComplete a été utilisée pour faire cette modification ?", + "render": "Fait avec {editor}" + } + }, + "title": { + "render": "Groupe de modifications pour {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "D'autres statistiques sont disponibles ici" + } + } + } + } + }, + "title": "Changements faits avec MapComplete" + }, "maproulette": { "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "title": "Tâches MapRoulette" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8344d4fba..2affa3f47 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -936,6 +936,89 @@ }, "title": "Stoepranden en oversteekplaatsen" }, + "mapcomplete-changes": { + "description": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden", + "layers": { + "0": { + "description": "Toon alle MapComplete wijzigingen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenaam bevat {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Gemaakt door bijdrager {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Niet gemaakt door bijdrager {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Gemaakt voor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Gemaakt na {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "De taal van de bijdrager is {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Gemaakt met host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset bevat minstens één afbeelding" + } + } + } + }, + "name": "Centerpunt van changeset", + "tagRenderings": { + "contributor": { + "question": "Welke bijdrager maakte deze wijziging?", + "render": "Wijziging gemaakt door {user}" + }, + "host": { + "question": "Met welke host (website) werd deze wijziging gemaakt?", + "render": "Wijziging gemaakt met {host}" + }, + "locale": { + "question": "In welke locale (taal) werd deze wijziging gemaakt?", + "render": "De gebruikerstaal is {locale}" + } + } + } + }, + "shortDescription": "Toon wijzigingen gemaakt met MapComplete", + "title": "Wijzigingen gemaakt met MapComplete" + }, "maproulette": { "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.", "title": "MapRoulette taken" diff --git a/scripts/GenerateSeries.ts b/scripts/GenerateSeries.ts index 6ed84955f..3017e8180 100644 --- a/scripts/GenerateSeries.ts +++ b/scripts/GenerateSeries.ts @@ -1,10 +1,10 @@ import { existsSync, readdirSync, readFileSync, unlinkSync, writeFileSync } from "fs" import ScriptUtils from "./ScriptUtils" -import { Utils } from "../Utils" +import { Utils } from "../src/Utils" import Script from "./Script" -import { GeoOperations } from "../Logic/GeoOperations" +import { GeoOperations } from "../src/Logic/GeoOperations" import { Feature, Polygon } from "geojson" -import { Tiles } from "../Models/TileRange" +import { Tiles } from "../src/Models/TileRange" class StatsDownloader { private readonly urlTemplate = diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index 0ab2ea2e6..e883af575 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -1,13 +1,16 @@ -import { Utils } from "../Utils" import * as meta from "../../package.json" +import { Utils } from "../Utils" export type PriviligedLayerType = (typeof Constants.priviliged_layers)[number] export default class Constants { + static { + console.log("Meta (package:json)", meta) + } public static vNumber = meta.version public static ImgurApiKey = meta.config.api_keys.imgur - public static readonly mapillary_client_token_v4 =meta.config.api_keys.mapillary_v4 + public static readonly mapillary_client_token_v4 = meta.config.api_keys.mapillary_v4 /** * API key for Maproulette diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts index 940056a99..a29afdcc4 100644 --- a/src/Models/ThemeConfig/TagRenderingConfig.ts +++ b/src/Models/ThemeConfig/TagRenderingConfig.ts @@ -242,7 +242,7 @@ export default class TagRenderingConfig { if (txt === "") { throw context + " Rendering for language " + ln + " is empty" } - if (txt.indexOf("{" + this.freeform.key + "}") >= 0) { + if (txt.indexOf("{" + this.freeform.key + "}") >= 0 || txt.indexOf("&LBRACE" + this.freeform.key + "&RBRACE") ) { continue } if (txt.indexOf("{" + this.freeform.key + ":") >= 0) { diff --git a/src/UI/Base/SubtleLink.svelte b/src/UI/Base/SubtleLink.svelte index 401c34a24..5a3d9f505 100644 --- a/src/UI/Base/SubtleLink.svelte +++ b/src/UI/Base/SubtleLink.svelte @@ -34,6 +34,7 @@ class={twMerge(options.extraClasses, "button text-ellipsis")} {href} target={newTab ? "_blank" : undefined} + rel={newTab ? "noopener" : undefined} > {#if imageUrl !== undefined} diff --git a/src/UI/BigComponents/ContactLink.svelte b/src/UI/BigComponents/ContactLink.svelte index f3ccac9e2..7cebd2c0d 100644 --- a/src/UI/BigComponents/ContactLink.svelte +++ b/src/UI/BigComponents/ContactLink.svelte @@ -35,7 +35,7 @@ src={`https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/${resource.type}.svg`} />
- + {resource.resolved.name ?? resource.resolved.url} {resource.resolved?.description} diff --git a/src/UI/BigComponents/CopyrightPanel.ts b/src/UI/BigComponents/CopyrightPanel.ts index 988a802ca..d066a4d00 100644 --- a/src/UI/BigComponents/CopyrightPanel.ts +++ b/src/UI/BigComponents/CopyrightPanel.ts @@ -102,7 +102,7 @@ export default class CopyrightPanel extends Combine { let bgAttr: BaseUIElement | string = undefined if (attrText && attrUrl) { bgAttr = - "" + attrText + "" + "" + attrText + "" } else if (attrUrl) { bgAttr = attrUrl } else { diff --git a/src/UI/BigComponents/UserProfile.svelte b/src/UI/BigComponents/UserProfile.svelte index 5ade85a15..5cb514a4d 100644 --- a/src/UI/BigComponents/UserProfile.svelte +++ b/src/UI/BigComponents/UserProfile.svelte @@ -37,6 +37,7 @@ diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index 25a5c2e36..bf3dce5ab 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -1250,7 +1250,7 @@ export default class SpecialVisualizations { }, { funcName: "link", - docs: "Construct a link. By using the 'special' visualisation notation, translation should be easier", + docs: "Construct a link. By using the 'special' visualisation notation, translations should be easier", args: [ { name: "text", From 39572f4767f270a4a5a40d8973ae9824ac3a43d1 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 01:57:03 +0200 Subject: [PATCH 124/134] Fix: remove all html-attributes from shortDescriptions in the theme overview --- scripts/fixQuestionHint.ts | 8 +++---- scripts/generateLayerOverview.ts | 41 +++++++++++++++++--------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/scripts/fixQuestionHint.ts b/scripts/fixQuestionHint.ts index e7b0a1b1e..1406d2b32 100644 --- a/scripts/fixQuestionHint.ts +++ b/scripts/fixQuestionHint.ts @@ -1,10 +1,10 @@ import * as fs from "fs" -import { DesugaringStep } from "../Models/ThemeConfig/Conversion/Conversion" -import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson" -import { QuestionableTagRenderingConfigJson } from "../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" +import { DesugaringStep } from "../src/Models/ThemeConfig/Conversion/Conversion" +import { LayerConfigJson } from "../src/Models/ThemeConfig/Json/LayerConfigJson" +import { QuestionableTagRenderingConfigJson } from "../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import * as fakedom from "fake-dom" import Script from "./Script" -import { FixedUiElement } from "../UI/Base/FixedUiElement" +import { FixedUiElement } from "../src/UI/Base/FixedUiElement" class ExtractQuestionHint extends DesugaringStep { constructor() { diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index 8cf68d9ff..1314f3578 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -1,26 +1,26 @@ -import ScriptUtils from "./ScriptUtils" -import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs" -import licenses from "../src/assets/generated/license_info.json" -import { LayoutConfigJson } from "../src/Models/ThemeConfig/Json/LayoutConfigJson" -import { LayerConfigJson } from "../src/Models/ThemeConfig/Json/LayerConfigJson" -import Constants from "../src/Models/Constants" +import ScriptUtils from "./ScriptUtils"; +import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs"; +import licenses from "../src/assets/generated/license_info.json"; +import { LayoutConfigJson } from "../src/Models/ThemeConfig/Json/LayoutConfigJson"; +import { LayerConfigJson } from "../src/Models/ThemeConfig/Json/LayerConfigJson"; +import Constants from "../src/Models/Constants"; import { DetectDuplicateFilters, DoesImageExist, PrevalidateTheme, ValidateLayer, - ValidateThemeAndLayers, -} from "../src/Models/ThemeConfig/Conversion/Validation" -import { Translation } from "../src/UI/i18n/Translation" -import { TagRenderingConfigJson } from "../src/Models/ThemeConfig/Json/TagRenderingConfigJson" -import PointRenderingConfigJson from "../src/Models/ThemeConfig/Json/PointRenderingConfigJson" -import { PrepareLayer } from "../src/Models/ThemeConfig/Conversion/PrepareLayer" -import { PrepareTheme } from "../src/Models/ThemeConfig/Conversion/PrepareTheme" -import { DesugaringContext } from "../src/Models/ThemeConfig/Conversion/Conversion" -import { Utils } from "../src/Utils" -import Script from "./Script" -import { AllSharedLayers } from "../src/Customizations/AllSharedLayers" - + ValidateThemeAndLayers +} from "../src/Models/ThemeConfig/Conversion/Validation"; +import { Translation } from "../src/UI/i18n/Translation"; +import { TagRenderingConfigJson } from "../src/Models/ThemeConfig/Json/TagRenderingConfigJson"; +import PointRenderingConfigJson from "../src/Models/ThemeConfig/Json/PointRenderingConfigJson"; +import { PrepareLayer } from "../src/Models/ThemeConfig/Conversion/PrepareLayer"; +import { PrepareTheme } from "../src/Models/ThemeConfig/Conversion/PrepareTheme"; +import { DesugaringContext } from "../src/Models/ThemeConfig/Conversion/Conversion"; +import { Utils } from "../src/Utils"; +import Script from "./Script"; +import { AllSharedLayers } from "../src/Customizations/AllSharedLayers"; +import {parse as parse_html} from "node-html-parser" // This scripts scans 'src/assets/layers/*.json' for layer definition files and 'src/assets/themes/*.json' for theme definition files. // It spits out an overview of those to be used to load them @@ -516,7 +516,10 @@ class LayerOverviewUtils extends Script { hideFromOverview: t.hideFromOverview ?? false, shortDescription: t.shortDescription ?? - new Translation(t.description).FirstSentence().translations, + new Translation(t.description) + .FirstSentence() + .OnEveryLanguage(s => parse_html(s).innerText) + .translations, mustHaveLanguage: t.mustHaveLanguage?.length > 0, } }) From 6e8617c93fd0fde8f0b27c035625e68d143f9b58 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 02:04:59 +0200 Subject: [PATCH 125/134] Fix: add check for missing 'noopener' attributes; add missing noopener attributes --- assets/layers/artwork/artwork.json | 41 +- assets/layers/climbing/climbing.json | 2 +- .../layers/nature_reserve/nature_reserve.json | 11 +- assets/layers/questions/questions.json | 6 +- assets/layers/sport_pitch/sport_pitch.json | 2 +- assets/layers/usersettings/usersettings.json | 18 +- .../mapcomplete-changes.json | 114 +-- src/Models/Constants.ts | 3 - .../ThemeConfig/Conversion/Validation.ts | 735 ++++++++++-------- src/UI/i18n/Translation.ts | 3 +- src/Utils.ts | 3 +- 11 files changed, 470 insertions(+), 468 deletions(-) diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 6f3ff8686..8d02b33d9 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -610,23 +610,30 @@ "he": "האם יש אתר אינטרנט עם מידע נוסף על היצירה הזו?" }, "render": { - "en": "More information on this website", - "nl": "Meer informatie op deze website", - "fr": "Plus d'info sûr ce site web", - "de": "Weitere Informationen auf dieser Webseite", - "id": "Info lanjut tersedia di laman web ini", - "it": "Ulteriori informazioni su questo sito web", - "ru": "Больше информации на этом сайте", - "ja": "Webサイトに詳細情報がある", - "zh_Hant": "這個網站有更多資訊", - "nb_NO": "Mer info er å finne på denne nettsiden", - "pt": "Mais informações neste site", - "hu": "További információ ezen a weboldalon", - "pl": "Więcej informacji na tej stronie", - "es": "Más información en este sitio web", - "da": "Yderligere oplysninger på dette websted", - "cs": "Více informací na této webové stránce", - "ca": "Més informació a aquesta pàgina web" + "special": { + "type": "link", + "href": "{website}", + "text": { + "en": "More information on this website", + "nl": "Meer informatie op deze website", + "fr": "Plus d'info sûr ce site web", + "de": "Weitere Informationen auf dieser Webseite", + "id": "Info lanjut tersedia di laman web ini", + "it": "Ulteriori informazioni su questo sito web", + "ru": "Больше информации на этом сайте", + "ja": "Webサイトに詳細情報がある", + "zh_Hant": "這個網站有更多資訊", + "nb_NO": "Mer info er å finne på denne nettsiden", + "pt": "Mais informações neste site", + "hu": "További információ ezen a weboldalon", + "pl": "Więcej informacji na tej stronie", + "es": "Más información en este sitio web", + "da": "Yderligere oplysninger på dette websted", + "cs": "Více informací na této webové stránce", + "ca": "Més informació a aquesta pàgina web" + } + } + }, "freeform": { "key": "website", diff --git a/assets/layers/climbing/climbing.json b/assets/layers/climbing/climbing.json index 5f6a4546b..6be535d0d 100644 --- a/assets/layers/climbing/climbing.json +++ b/assets/layers/climbing/climbing.json @@ -32,7 +32,7 @@ "club=" ] }, - "render": "{url}", + "render": "{url}", "freeform": { "key": "url", "type": "url" diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index f8c555c55..7e9ee0669 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -360,14 +360,7 @@ "ca": "A quina adreça de correu electrònic es pot enviar amb preguntes i problemes amb aquest parc natural?" }, "render": { - "nl": "{email}", - "en": "{email}", - "ca": "{email}", - "de": "{email}", - "fr": "{email}", - "it": "{email}", - "ru": "{email}", - "id": "{email}" + "*": "{email}" }, "freeform": { "key": "email", @@ -393,7 +386,7 @@ "ca": "A quin número de telèfon es pot trucar amb preguntes i problemes amb aquest parc natural?" }, "render": { - "*": "{phone}" + "*": "{phone}" }, "freeform": { "key": "phone", diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index c3412b52d..ff9cca18c 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -208,7 +208,7 @@ { "id": "osmlink", "render": { - "*": "" + "*": "" }, "mappings": [ { @@ -220,7 +220,7 @@ { "id": "email", "render": { - "*": "{email}" + "*": "{email}" }, "icon": "./assets/svg/envelope.svg", "labels": [ @@ -255,7 +255,7 @@ { "if": "contact:email~*", "icon": "./assets/svg/envelope.svg", - "then": "{contact:email}", + "then": "{contact:email}", "hideInAnswer": true } ], diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 8ad88f522..900547099 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -491,7 +491,7 @@ "key": "email", "type": "email" }, - "render": "{email}", + "render": "{email}", "id": "sport_pitch-email" }, { diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index dde6c2791..dc039c295 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -406,7 +406,7 @@ "special": { "type": "multi", "key": "_translation_links", - "tagrendering": "Translate entries of {id}" + "tagrendering": "Translate entries of {id}" } } }, @@ -416,20 +416,20 @@ { "if": "_mastodon_link~*", "then": { - "en": "A link to your Mastodon-profile has been been found: {_mastodon_link}", - "de": "Es wurde ein Link zu deinem Mastodon-Profil gefunden: {_mastodon_link}", - "nl": "Een link naar je Mastodon-profiel werd gevonden: {_mastodon_link}", - "fr": "Un lien vers votre profil Mastodon a été trouvé : {_mastodon_link}", - "ca": "S'ha trobat un enllaç al vostre perfil de Mastodon: {_mastodon_link}" + "en": "A link to your Mastodon-profile has been been found: {_mastodon_link}", + "de": "Es wurde ein Link zu deinem Mastodon-Profil gefunden: {_mastodon_link}", + "nl": "Een link naar je Mastodon-profiel werd gevonden: {_mastodon_link}", + "fr": "Un lien vers votre profil Mastodon a été trouvé : {_mastodon_link}", + "ca": "S'ha trobat un enllaç al vostre perfil de Mastodon: {_mastodon_link}" }, "icon": "mastodon" }, { "if": "_mastodon_candidate~*", "then": { - "en": "We found a link to what looks to be a mastodon account, but it is unverified. Edit your profile description and place the following there: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>", - "de": "Wir haben einen Link gefunden, der aussieht wie ein Mastodon-Konto, aber nicht verifiziert ist. Bearbeiten Sie Ihre Profilbeschreibung und fügen Sie dort Folgendes ein: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>", - "nl": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.Pas je profielbeschrijving aan en plaats er de volgende code: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" + "en": "We found a link to what looks to be a mastodon account, but it is unverified. Edit your profile description and place the following there: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>", + "de": "Wir haben einen Link gefunden, der aussieht wie ein Mastodon-Konto, aber nicht verifiziert ist. Bearbeiten Sie Ihre Profilbeschreibung und fügen Sie dort Folgendes ein: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>", + "nl": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.Pas je profielbeschrijving aan en plaats er de volgende code: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" }, "icon": "invalid" } diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 3bd0b3b29..dabbec8e1 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,21 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "fr": "Changements faits avec MapComplete", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "nl": "Toon wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "fr": "Cette carte montre tous les changements faits avec MapComplete", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -28,9 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "nl": "Centerpunt van changeset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -41,57 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "fr": "Groupe de modifications pour {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "fr": "Groupe de modifications {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "fr": "Quel contributeur a fait cette modification ?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung gemacht von {user}", - "fr": "Modification faite par {user}", - "nl": "Wijziging gemaakt door {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für diese Änderung verwendet?", - "fr": "Quel thème a été utilisé pour faire cette modification ?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "fr": "Modifié avec le thème {theme}" + "en": "Change with theme {theme}" } }, { @@ -100,29 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Sprache wurde diese Änderung vorgenommen?", - "fr": "En quelle langue est-ce que ce changement a été fait ?", - "nl": "In welke locale (taal) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Usersprache ist {locale}", - "nl": "De gebruikerstaal is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "de": "Änderung vorgenommen mit {host}", - "fr": "Modification faite avec {host}", - "nl": "Wijziging gemaakt met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -143,14 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", - "fr": "Quelle version de MapComplete a été utilisée pour faire cette modification ?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}", - "fr": "Fait avec {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -492,9 +452,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themenaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -510,9 +468,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -528,9 +484,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -547,9 +501,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -566,9 +518,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -584,10 +534,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "fr": "Langage utilisateur (code-ISO) {search}", - "nl": "De taal van de bijdrager is {search}" + "en": "User language (iso-code) {search}" } } ] @@ -603,9 +550,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -616,10 +561,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Changeset fügte mindestens ein Bild hinzu", - "fr": "Le groupe de modifications a ajouté au moins une image", - "nl": "Changeset bevat minstens één afbeelding" + "en": "Changeset added at least one image" } } ] @@ -634,9 +576,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier", - "fr": "D'autres statistiques sont disponibles ici" + "en": "More statistics can be found here" } }, { @@ -666,4 +606,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index e883af575..2d7a87e74 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -4,9 +4,6 @@ import { Utils } from "../Utils" export type PriviligedLayerType = (typeof Constants.priviliged_layers)[number] export default class Constants { - static { - console.log("Meta (package:json)", meta) - } public static vNumber = meta.version public static ImgurApiKey = meta.config.api_keys.imgur diff --git a/src/Models/ThemeConfig/Conversion/Validation.ts b/src/Models/ThemeConfig/Conversion/Validation.ts index d79c7bc17..d51ae560e 100644 --- a/src/Models/ThemeConfig/Conversion/Validation.ts +++ b/src/Models/ThemeConfig/Conversion/Validation.ts @@ -1,42 +1,43 @@ -import { DesugaringStep, Each, Fuse, On } from "./Conversion" -import { LayerConfigJson } from "../Json/LayerConfigJson" -import LayerConfig from "../LayerConfig" -import { Utils } from "../../../Utils" -import Constants from "../../Constants" -import { Translation } from "../../../UI/i18n/Translation" -import { LayoutConfigJson } from "../Json/LayoutConfigJson" -import LayoutConfig from "../LayoutConfig" -import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson" -import { TagUtils } from "../../../Logic/Tags/TagUtils" -import { ExtractImages } from "./FixImages" -import { And } from "../../../Logic/Tags/And" -import Translations from "../../../UI/i18n/Translations" -import Svg from "../../../Svg" -import FilterConfigJson from "../Json/FilterConfigJson" -import DeleteConfig from "../DeleteConfig" -import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson" -import Validators from "../../../UI/InputElement/Validators" -import TagRenderingConfig from "../TagRenderingConfig" +import { DesugaringStep, Each, Fuse, On } from "./Conversion"; +import { LayerConfigJson } from "../Json/LayerConfigJson"; +import LayerConfig from "../LayerConfig"; +import { Utils } from "../../../Utils"; +import Constants from "../../Constants"; +import { Translation } from "../../../UI/i18n/Translation"; +import { LayoutConfigJson } from "../Json/LayoutConfigJson"; +import LayoutConfig from "../LayoutConfig"; +import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson"; +import { TagUtils } from "../../../Logic/Tags/TagUtils"; +import { ExtractImages } from "./FixImages"; +import { And } from "../../../Logic/Tags/And"; +import Translations from "../../../UI/i18n/Translations"; +import Svg from "../../../Svg"; +import FilterConfigJson from "../Json/FilterConfigJson"; +import DeleteConfig from "../DeleteConfig"; +import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson"; +import Validators from "../../../UI/InputElement/Validators"; +import TagRenderingConfig from "../TagRenderingConfig"; +import { parse as parse_html } from "node-html-parser"; class ValidateLanguageCompleteness extends DesugaringStep { - private readonly _languages: string[] + private readonly _languages: string[]; constructor(...languages: string[]) { super( "Checks that the given object is fully translated in the specified languages", [], "ValidateLanguageCompleteness" - ) - this._languages = languages ?? ["en"] + ); + this._languages = languages ?? ["en"]; } convert( obj: any, context: string ): { result: LayerConfig; errors: string[]; warnings: string[] } { - const errors = [] - const warnings: string[] = [] - const translations = Translation.ExtractAllTranslationsFrom(obj) + const errors = []; + const warnings: string[] = []; + const translations = Translation.ExtractAllTranslationsFrom(obj); for (const neededLanguage of this._languages) { translations .filter( @@ -47,38 +48,38 @@ class ValidateLanguageCompleteness extends DesugaringStep { .forEach((missing) => { errors.push( context + - "A theme should be translation-complete for " + - neededLanguage + - ", but it lacks a translation for " + - missing.context + - ".\n\tThe known translation is " + - missing.tr.textFor("en") - ) - }) + "A theme should be translation-complete for " + + neededLanguage + + ", but it lacks a translation for " + + missing.context + + ".\n\tThe known translation is " + + missing.tr.textFor("en") + ); + }); } return { result: obj, errors, - warnings, - } + warnings + }; } } export class DoesImageExist extends DesugaringStep { - private readonly _knownImagePaths: Set - private readonly _ignore?: Set - private readonly doesPathExist: (path: string) => boolean = undefined + private readonly _knownImagePaths: Set; + private readonly _ignore?: Set; + private readonly doesPathExist: (path: string) => boolean = undefined; constructor( knownImagePaths: Set, checkExistsSync: (path: string) => boolean = undefined, ignore?: Set ) { - super("Checks if an image exists", [], "DoesImageExist") - this._ignore = ignore - this._knownImagePaths = knownImagePaths - this.doesPathExist = checkExistsSync + super("Checks if an image exists", [], "DoesImageExist"); + this._ignore = ignore; + this._knownImagePaths = knownImagePaths; + this.doesPathExist = checkExistsSync; } convert( @@ -86,53 +87,53 @@ export class DoesImageExist extends DesugaringStep { context: string ): { result: string; errors?: string[]; warnings?: string[]; information?: string[] } { if (this._ignore?.has(image)) { - return { result: image } + return { result: image }; } - const errors = [] - const warnings = [] - const information = [] + const errors = []; + const warnings = []; + const information = []; if (image.indexOf("{") >= 0) { - information.push("Ignoring image with { in the path: " + image) - return { result: image } + information.push("Ignoring image with { in the path: " + image); + return { result: image }; } if (image === "assets/SocialImage.png") { - return { result: image } + return { result: image }; } if (image.match(/[a-z]*/)) { if (Svg.All[image + ".svg"] !== undefined) { // This is a builtin img, e.g. 'checkmark' or 'crosshair' - return { result: image } + return { result: image }; } } if (image.startsWith("<") && image.endsWith(">")) { // This is probably HTML, you're on your own here - return { result: image } + return { result: image }; } if (!this._knownImagePaths.has(image)) { if (this.doesPathExist === undefined) { errors.push( `Image with path ${image} not found or not attributed; it is used in ${context}` - ) + ); } else if (!this.doesPathExist(image)) { errors.push( `Image with path ${image} does not exist; it is used in ${context}.\n Check for typo's and missing directories in the path.` - ) + ); } else { errors.push( `Image with path ${image} is not attributed (but it exists); execute 'npm run query:licenses' to add the license information and/or run 'npm run generate:licenses' to compile all the license info` - ) + ); } } return { result: image, errors, warnings, - information, - } + information + }; } } @@ -141,11 +142,11 @@ class ValidateTheme extends DesugaringStep { * The paths where this layer is originally saved. Triggers some extra checks * @private */ - private readonly _path?: string - private readonly _isBuiltin: boolean + private readonly _path?: string; + private readonly _isBuiltin: boolean; //private readonly _sharedTagRenderings: Map - private readonly _validateImage: DesugaringStep - private readonly _extractImages: ExtractImages = undefined + private readonly _validateImage: DesugaringStep; + private readonly _extractImages: ExtractImages = undefined; constructor( doesImageExist: DoesImageExist, @@ -153,12 +154,12 @@ class ValidateTheme extends DesugaringStep { isBuiltin: boolean, sharedTagRenderings?: Set ) { - super("Doesn't change anything, but emits warnings and errors", [], "ValidateTheme") - this._validateImage = doesImageExist - this._path = path - this._isBuiltin = isBuiltin + super("Doesn't change anything, but emits warnings and errors", [], "ValidateTheme"); + this._validateImage = doesImageExist; + this._path = path; + this._isBuiltin = isBuiltin; if (sharedTagRenderings) { - this._extractImages = new ExtractImages(this._isBuiltin, sharedTagRenderings) + this._extractImages = new ExtractImages(this._isBuiltin, sharedTagRenderings); } } @@ -166,11 +167,11 @@ class ValidateTheme extends DesugaringStep { json: LayoutConfigJson, context: string ): { result: LayoutConfigJson; errors: string[]; warnings: string[]; information: string[] } { - const errors = [] - const warnings = [] - const information = [] + const errors = []; + const warnings = []; + const information = []; - const theme = new LayoutConfig(json, this._isBuiltin) + const theme = new LayoutConfig(json, this._isBuiltin); { // Legacy format checks @@ -178,31 +179,31 @@ class ValidateTheme extends DesugaringStep { if (json["units"] !== undefined) { errors.push( "The theme " + - json.id + - " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) " - ) + json.id + + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) " + ); } if (json["roamingRenderings"] !== undefined) { errors.push( "Theme " + - json.id + - " contains an old 'roamingRenderings'. Use an 'overrideAll' instead" - ) + json.id + + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead" + ); } } } if (this._isBuiltin && this._extractImages !== undefined) { // Check images: are they local, are the licenses there, is the theme icon square, ... - const images = this._extractImages.convertStrict(json, "validation") - const remoteImages = images.filter((img) => img.path.indexOf("http") == 0) + const images = this._extractImages.convertStrict(json, "validation"); + const remoteImages = images.filter((img) => img.path.indexOf("http") == 0); for (const remoteImage of remoteImages) { errors.push( "Found a remote image: " + - remoteImage + - " in theme " + - json.id + - ", please download it." - ) + remoteImage + + " in theme " + + json.id + + ", please download it." + ); } for (const image of images) { this._validateImage.convertJoin( @@ -211,30 +212,30 @@ class ValidateTheme extends DesugaringStep { errors, warnings, information - ) + ); } } try { if (this._isBuiltin) { if (theme.id !== theme.id.toLowerCase()) { - errors.push("Theme ids should be in lowercase, but it is " + theme.id) + errors.push("Theme ids should be in lowercase, but it is " + theme.id); } const filename = this._path.substring( this._path.lastIndexOf("/") + 1, this._path.length - 5 - ) + ); if (theme.id !== filename) { errors.push( "Theme ids should be the same as the name.json, but we got id: " + - theme.id + - " and filename " + - filename + - " (" + - this._path + - ")" - ) + theme.id + + " and filename " + + filename + + " (" + + this._path + + ")" + ); } this._validateImage.convertJoin( theme.icon, @@ -242,44 +243,44 @@ class ValidateTheme extends DesugaringStep { errors, warnings, information - ) + ); } - const dups = Utils.Dupiclates(json.layers.map((layer) => layer["id"])) + const dups = Utils.Dupiclates(json.layers.map((layer) => layer["id"])); if (dups.length > 0) { errors.push( `The theme ${json.id} defines multiple layers with id ${dups.join(", ")}` - ) + ); } if (json["mustHaveLanguage"] !== undefined) { const checked = new ValidateLanguageCompleteness( ...json["mustHaveLanguage"] - ).convert(theme, theme.id) + ).convert(theme, theme.id); - errors.push(...checked.errors) + errors.push(...checked.errors); } if (!json.hideFromOverview && theme.id !== "personal" && this._isBuiltin) { // The first key in the the title-field must be english, otherwise the title in the loading page will be the different language - const targetLanguage = theme.title.SupportedLanguages()[0] + const targetLanguage = theme.title.SupportedLanguages()[0]; if (targetLanguage !== "en") { warnings.push( `TargetLanguage is not 'en' for public theme ${theme.id}, it is ${targetLanguage}. Move 'en' up in the title of the theme and set it as the first key` - ) + ); } // Official, public themes must have a full english translation - const checked = new ValidateLanguageCompleteness("en").convert(theme, theme.id) - errors.push(...checked.errors) + const checked = new ValidateLanguageCompleteness("en").convert(theme, theme.id); + errors.push(...checked.errors); } } catch (e) { - errors.push(e) + errors.push(e); } return { result: json, errors, warnings, - information, - } + information + }; } } @@ -294,7 +295,7 @@ export class ValidateThemeAndLayers extends Fuse { "Validates a theme and the contained layers", new ValidateTheme(doesImageExist, path, isBuiltin, sharedTagRenderings), new On("layers", new Each(new ValidateLayer(undefined, isBuiltin, doesImageExist))) - ) + ); } } @@ -304,26 +305,26 @@ class OverrideShadowingCheck extends DesugaringStep { "Checks that an 'overrideAll' does not override a single override", [], "OverrideShadowingCheck" - ) + ); } convert( json: LayoutConfigJson, _: string ): { result: LayoutConfigJson; errors?: string[]; warnings?: string[] } { - const overrideAll = json.overrideAll + const overrideAll = json.overrideAll; if (overrideAll === undefined) { - return { result: json } + return { result: json }; } - const errors = [] - const withOverride = json.layers.filter((l) => l["override"] !== undefined) + const errors = []; + const withOverride = json.layers.filter((l) => l["override"] !== undefined); for (const layer of withOverride) { for (const key in overrideAll) { if (key.endsWith("+") || key.startsWith("+")) { // This key will _add_ to the list, not overwrite it - so no warning is needed - continue + continue; } if ( layer["override"][key] !== undefined || @@ -334,19 +335,19 @@ class OverrideShadowingCheck extends DesugaringStep { JSON.stringify(layer["builtin"]) + " has a shadowed property: " + key + - " is overriden by overrideAll of the theme" - errors.push(w) + " is overriden by overrideAll of the theme"; + errors.push(w); } } } - return { result: json, errors } + return { result: json, errors }; } } class MiscThemeChecks extends DesugaringStep { constructor() { - super("Miscelleanous checks on the theme", [], "MiscThemesChecks") + super("Miscelleanous checks on the theme", [], "MiscThemesChecks"); } convert( @@ -358,19 +359,19 @@ class MiscThemeChecks extends DesugaringStep { warnings?: string[] information?: string[] } { - const warnings = [] - const errors = [] + const warnings = []; + const errors = []; if (json.id !== "personal" && (json.layers === undefined || json.layers.length === 0)) { - errors.push("The theme " + json.id + " has no 'layers' defined (" + context + ")") + errors.push("The theme " + json.id + " has no 'layers' defined (" + context + ")"); } if (json.socialImage === "") { - warnings.push("Social image for theme " + json.id + " is the emtpy string") + warnings.push("Social image for theme " + json.id + " is the emtpy string"); } return { result: json, warnings, - errors, - } + errors + }; } } @@ -380,7 +381,7 @@ export class PrevalidateTheme extends Fuse { "Various consistency checks on the raw JSON", new MiscThemeChecks(), new OverrideShadowingCheck() - ) + ); } } @@ -390,7 +391,7 @@ export class DetectConflictingAddExtraTags extends DesugaringStep 0)) { - return { result: json } + return { result: json }; } - const tagRendering = new TagRenderingConfig(json) + const tagRendering = new TagRenderingConfig(json); - const errors = [] + const errors = []; for (let i = 0; i < tagRendering.mappings.length; i++) { - const mapping = tagRendering.mappings[i] + const mapping = tagRendering.mappings[i]; if (!mapping.addExtraTags) { - continue + continue; } - const keysInMapping = new Set(mapping.if.usedKeys()) + const keysInMapping = new Set(mapping.if.usedKeys()); - const keysInAddExtraTags = mapping.addExtraTags.map((t) => t.key) + const keysInAddExtraTags = mapping.addExtraTags.map((t) => t.key); - const duplicateKeys = keysInAddExtraTags.filter((k) => keysInMapping.has(k)) + const duplicateKeys = keysInAddExtraTags.filter((k) => keysInMapping.has(k)); if (duplicateKeys.length > 0) { errors.push( "At " + - context + - ".mappings[" + - i + - "]: AddExtraTags overrides a key that is set in the `if`-clause of this mapping. Selecting this answer might thus first set one value (needed to match as answer) and then override it with a different value, resulting in an unsaveable question. The offending `addExtraTags` is " + - duplicateKeys.join(", ") - ) + context + + ".mappings[" + + i + + "]: AddExtraTags overrides a key that is set in the `if`-clause of this mapping. Selecting this answer might thus first set one value (needed to match as answer) and then override it with a different value, resulting in an unsaveable question. The offending `addExtraTags` is " + + duplicateKeys.join(", ") + ); } } return { result: json, - errors, - } + errors + }; } } export class DetectShadowedMappings extends DesugaringStep { - private readonly _calculatedTagNames: string[] + private readonly _calculatedTagNames: string[]; constructor(layerConfig?: LayerConfigJson) { - super("Checks that the mappings don't shadow each other", [], "DetectShadowedMappings") - this._calculatedTagNames = DetectShadowedMappings.extractCalculatedTagNames(layerConfig) + super("Checks that the mappings don't shadow each other", [], "DetectShadowedMappings"); + this._calculatedTagNames = DetectShadowedMappings.extractCalculatedTagNames(layerConfig); } /** @@ -457,11 +458,11 @@ export class DetectShadowedMappings extends DesugaringStep { if (ct.indexOf(":=") >= 0) { - return ct.split(":=")[0] + return ct.split(":=")[0]; } - return ct.split("=")[0] + return ct.split("=")[0]; }) ?? [] - ) + ); } /** @@ -501,40 +502,40 @@ export class DetectShadowedMappings extends DesugaringStep { - const ctx = `${context}.mappings[${i}]` - const ifTags = TagUtils.Tag(m.if, ctx) - const hideInAnswer = m["hideInAnswer"] + const ctx = `${context}.mappings[${i}]`; + const ifTags = TagUtils.Tag(m.if, ctx); + const hideInAnswer = m["hideInAnswer"]; if (hideInAnswer !== undefined && hideInAnswer !== false && hideInAnswer !== true) { - let conditionTags = TagUtils.Tag(hideInAnswer) + let conditionTags = TagUtils.Tag(hideInAnswer); // Merge the condition too! - return new And([conditionTags, ifTags]) + return new And([conditionTags, ifTags]); } - return ifTags - }) + return ifTags; + }); for (let i = 0; i < json.mappings.length; i++) { if (!parsedConditions[i].isUsableAsAnswer()) { // There is no straightforward way to convert this mapping.if into a properties-object, so we simply skip this one // Yes, it might be shadowed, but running this check is to difficult right now - continue + continue; } - const keyValues = parsedConditions[i].asChange(defaultProperties) - const properties = {} + const keyValues = parsedConditions[i].asChange(defaultProperties); + const properties = {}; keyValues.forEach(({ k, v }) => { - properties[k] = v - }) + properties[k] = v; + }); for (let j = 0; j < i; j++) { - const doesMatch = parsedConditions[j].matchesProperties(properties) + const doesMatch = parsedConditions[j].matchesProperties(properties); if ( doesMatch && json.mappings[j]["hideInAnswer"] === true && @@ -542,15 +543,15 @@ export class DetectShadowedMappings extends DesugaringStep= 0 - const images = Utils.Dedup(Translations.T(mapping.then)?.ExtractImages() ?? []) - const ctx = `${context}.mappings[${i}]` + const mapping = json.mappings[i]; + const ignore = mapping["#"]?.indexOf(ignoreToken) >= 0; + const images = Utils.Dedup(Translations.T(mapping.then)?.ExtractImages() ?? []); + const ctx = `${context}.mappings[${i}]`; if (images.length > 0) { if (!ignore) { errors.push( `${ctx}: A mapping has an image in the 'then'-clause. Remove the image there and use \`"icon": \` instead. The images found are ${images.join( ", " )}. (This check can be turned of by adding "#": "${ignoreToken}" in the mapping, but this is discouraged` - ) + ); } else { information.push( `${ctx}: Ignored image ${images.join( ", " )} in 'then'-clause of a mapping as this check has been disabled` - ) + ); for (const image of images) { - this._doesImageExist.convertJoin(image, ctx, errors, warnings, information) + this._doesImageExist.convertJoin(image, ctx, errors, warnings, information); } } } else if (ignore) { - warnings.push(`${ctx}: unused '${ignoreToken}' - please remove this`) + warnings.push(`${ctx}: unused '${ignoreToken}' - please remove this`); } } @@ -654,17 +655,72 @@ export class DetectMappingsWithImages extends DesugaringStep> { + constructor() { + super("Given a possible set of translations, validates that does have `rel='noopener'` set", [], "ValidatePossibleLinks"); + } + + public isTabnabbingProne(str: string): boolean { + const p = parse_html(str); + const links = Array.from(p.getElementsByTagName("a")); + if (links.length == 0) { + return false; } + for (const link of Array.from(links)) { + if (link.getAttribute("target") !== "_blank") { + continue; + } + const rel = new Set(link.getAttribute("rel")?.split(" ") ?? []); + if (rel.has("noopener")) { + continue; + } + const source = link.getAttribute("href"); + if (source.startsWith("http")) { + // No variable part - we assume the link is safe + continue; + } + return true; + } + return false; + } + + convert(json: string | Record, context: string): { + result: string | Record; + errors?: string[]; + warnings?: string[]; + information?: string[] + } { + + const errors = []; + if (typeof json === "string") { + if (this.isTabnabbingProne(json)) { + errors.push("At " + context + ": the string " + json + " has a link targeting `_blank`, but it doesn't have `rel='noopener'` set. This gives rise to reverse tabnapping"); + } + } else { + for (const k in json) { + if (this.isTabnabbingProne(json[k])) { + errors.push(`At ${context}: the translation for ${k} '${json[k]}' has a link targeting \`_blank\`, but it doesn't have \`rel='noopener'\` set. This gives rise to reverse tabnapping`); + } + } + } + return { + errors, + result: json + }; } } class MiscTagRenderingChecks extends DesugaringStep { - private _options: { noQuestionHintCheck: boolean } + private _options: { noQuestionHintCheck: boolean }; constructor(options: { noQuestionHintCheck: boolean }) { - super("Miscellaneous checks on the tagrendering", ["special"], "MiscTagRenderingChecks") - this._options = options + super("Miscellaneous checks on the tagrendering", ["special"], "MiscTagRenderingChecks"); + this._options = options; } convert( @@ -676,25 +732,26 @@ class MiscTagRenderingChecks extends DesugaringStep { warnings?: string[] information?: string[] } { - const warnings = [] - const errors = [] + const warnings = []; + const errors = []; if (json["special"] !== undefined) { errors.push( "At " + - context + - ': detected `special` on the top level. Did you mean `{"render":{ "special": ... }}`' - ) + context + + ": detected `special` on the top level. Did you mean `{\"render\":{ \"special\": ... }}`" + ); } if (json["group"]) { errors.push( "At " + - context + - ': groups are deprecated, use `"label": ["' + - json["group"] + - '"]` instead' - ) + context + + ": groups are deprecated, use `\"label\": [\"" + + json["group"] + + "\"]` instead" + ); } - const freeformType = json["freeform"]?.["type"] + + const freeformType = json["freeform"]?.["type"]; if (freeformType) { if (Validators.availableTypes.indexOf(freeformType) < 0) { throw ( @@ -704,14 +761,14 @@ class MiscTagRenderingChecks extends DesugaringStep { freeformType + "; try one of " + Validators.availableTypes.join(", ") - ) + ); } } return { result: json, errors, - warnings, - } + warnings + }; } } @@ -726,8 +783,16 @@ export class ValidateTagRenderings extends Fuse { new DetectShadowedMappings(layerConfig), new DetectConflictingAddExtraTags(), new DetectMappingsWithImages(doesImageExist), + new On("render", + new ValidatePossibleLinks()), + new On("question", + new ValidatePossibleLinks()), + new On("questionHint", + new ValidatePossibleLinks()), + new On("mappings", + new Each(new On("then", new ValidatePossibleLinks()))), new MiscTagRenderingChecks(options) - ) + ); } } @@ -736,41 +801,41 @@ export class ValidateLayer extends DesugaringStep { * The paths where this layer is originally saved. Triggers some extra checks * @private */ - private readonly _path?: string - private readonly _isBuiltin: boolean - private readonly _doesImageExist: DoesImageExist + private readonly _path?: string; + private readonly _isBuiltin: boolean; + private readonly _doesImageExist: DoesImageExist; constructor(path: string, isBuiltin: boolean, doesImageExist: DoesImageExist) { - super("Doesn't change anything, but emits warnings and errors", [], "ValidateLayer") - this._path = path - this._isBuiltin = isBuiltin - this._doesImageExist = doesImageExist + super("Doesn't change anything, but emits warnings and errors", [], "ValidateLayer"); + this._path = path; + this._isBuiltin = isBuiltin; + this._doesImageExist = doesImageExist; } convert( json: LayerConfigJson, context: string ): { result: LayerConfigJson; errors: string[]; warnings?: string[]; information?: string[] } { - const errors = [] - const warnings = [] - const information = [] - context = "While validating a layer: " + context + const errors = []; + const warnings = []; + const information = []; + context = "While validating a layer: " + context; if (typeof json === "string") { - errors.push(context + ": This layer hasn't been expanded: " + json) + errors.push(context + ": This layer hasn't been expanded: " + json); return { result: null, - errors, - } + errors + }; } if (json.source === "special") { if (!Constants.priviliged_layers.find((x) => x == json.id)) { errors.push( context + - ": layer " + - json.id + - " uses 'special' as source.osmTags. However, this layer is not a priviliged layer" - ) + ": layer " + + json.id + + " uses 'special' as source.osmTags. However, this layer is not a priviliged layer" + ); } } @@ -778,49 +843,49 @@ export class ValidateLayer extends DesugaringStep { if (json.title === undefined && json.source !== "special:library") { errors.push( context + - ": this layer does not have a title defined but it does have tagRenderings. Not having a title will disable the popups, resulting in an unclickable element. Please add a title. If not having a popup is intended and the tagrenderings need to be kept (e.g. in a library layer), set `title: null` to disable this error." - ) + ": this layer does not have a title defined but it does have tagRenderings. Not having a title will disable the popups, resulting in an unclickable element. Please add a title. If not having a popup is intended and the tagrenderings need to be kept (e.g. in a library layer), set `title: null` to disable this error." + ); } if (json.title === null) { information.push( context + - ": title is `null`. This results in an element that cannot be clicked - even though tagRenderings is set." - ) + ": title is `null`. This results in an element that cannot be clicked - even though tagRenderings is set." + ); } } if (json["builtin"] !== undefined) { - errors.push(context + ": This layer hasn't been expanded: " + json) + errors.push(context + ": This layer hasn't been expanded: " + json); return { result: null, - errors, - } + errors + }; } if (json.minzoom > Constants.minZoomLevelToAddNewPoint) { ;(json.presets?.length > 0 ? errors : warnings).push( `At ${context}: minzoom is ${json.minzoom}, this should be at most ${Constants.minZoomLevelToAddNewPoint} as a preset is set. Why? Selecting the pin for a new item will zoom in to level before adding the point. Having a greater minzoom will hide the points, resulting in possible duplicates` - ) + ); } { // duplicate ids in tagrenderings check const duplicates = Utils.Dedup( Utils.Dupiclates(Utils.NoNull((json.tagRenderings ?? []).map((tr) => tr["id"]))) - ) + ); if (duplicates.length > 0) { - console.log(json.tagRenderings) + console.log(json.tagRenderings); errors.push( "At " + - context + - ": some tagrenderings have a duplicate id: " + - duplicates.join(", ") - ) + context + + ": some tagrenderings have a duplicate id: " + + duplicates.join(", ") + ); } } if (json.deletion !== undefined && json.deletion instanceof DeleteConfig) { if (json.deletion.softDeletionTags === undefined) { - warnings.push("No soft-deletion tags in deletion block for layer " + json.id) + warnings.push("No soft-deletion tags in deletion block for layer " + json.id); } } @@ -831,9 +896,9 @@ export class ValidateLayer extends DesugaringStep { if (json["overpassTags"] !== undefined) { errors.push( "Layer " + - json.id + - 'still uses the old \'overpassTags\'-format. Please use "source": {"osmTags": }\' instead of "overpassTags": (note: this isn\'t your fault, the custom theme generator still spits out the old format)' - ) + json.id + + "still uses the old 'overpassTags'-format. Please use \"source\": {\"osmTags\": }' instead of \"overpassTags\": (note: this isn't your fault, the custom theme generator still spits out the old format)" + ); } const forbiddenTopLevel = [ "icon", @@ -844,88 +909,88 @@ export class ValidateLayer extends DesugaringStep { "width", "color", "colour", - "iconOverlays", - ] + "iconOverlays" + ]; for (const forbiddenKey of forbiddenTopLevel) { if (json[forbiddenKey] !== undefined) errors.push( context + - ": layer " + - json.id + - " still has a forbidden key " + - forbiddenKey - ) + ": layer " + + json.id + + " still has a forbidden key " + + forbiddenKey + ); } if (json["hideUnderlayingFeaturesMinPercentage"] !== undefined) { errors.push( context + - ": layer " + - json.id + - " contains an old 'hideUnderlayingFeaturesMinPercentage'" - ) + ": layer " + + json.id + + " contains an old 'hideUnderlayingFeaturesMinPercentage'" + ); } if ( json.isShown !== undefined && (json.isShown["render"] !== undefined || json.isShown["mappings"] !== undefined) ) { - warnings.push(context + " has a tagRendering as `isShown`") + warnings.push(context + " has a tagRendering as `isShown`"); } } if (this._isBuiltin) { // Check location of layer file - const expected: string = `assets/layers/${json.id}/${json.id}.json` + const expected: string = `assets/layers/${json.id}/${json.id}.json`; if (this._path != undefined && this._path.indexOf(expected) < 0) { errors.push( "Layer is in an incorrect place. The path is " + - this._path + - ", but expected " + - expected - ) + this._path + + ", but expected " + + expected + ); } } if (this._isBuiltin) { // Check for correct IDs if (json.tagRenderings?.some((tr) => tr["id"] === "")) { - const emptyIndexes: number[] = [] + const emptyIndexes: number[] = []; for (let i = 0; i < json.tagRenderings.length; i++) { - const tagRendering = json.tagRenderings[i] + const tagRendering = json.tagRenderings[i]; if (tagRendering["id"] === "") { - emptyIndexes.push(i) + emptyIndexes.push(i); } } errors.push( `Some tagrendering-ids are empty or have an emtpy string; this is not allowed (at ${context}.tagRenderings.[${emptyIndexes.join( "," )}])` - ) + ); } const duplicateIds = Utils.Dupiclates( (json.tagRenderings ?? []) ?.map((f) => f["id"]) .filter((id) => id !== "questions") - ) + ); if (duplicateIds.length > 0 && !Utils.runningFromConsole) { errors.push( `Some tagRenderings have a duplicate id: ${duplicateIds} (at ${context}.tagRenderings)` - ) + ); } if (json.description === undefined) { if (typeof json.source === null) { - errors.push(context + ": A priviliged layer must have a description") + errors.push(context + ": A priviliged layer must have a description"); } else { - warnings.push(context + ": A builtin layer should have a description") + warnings.push(context + ": A builtin layer should have a description"); } } } if (json.filter) { - const r = new On("filter", new Each(new ValidateFilter())).convert(json, context) - warnings.push(...(r.warnings ?? [])) - errors.push(...(r.errors ?? [])) - information.push(...(r.information ?? [])) + const r = new On("filter", new Each(new ValidateFilter())).convert(json, context); + warnings.push(...(r.warnings ?? [])); + errors.push(...(r.errors ?? [])); + information.push(...(r.information ?? [])); } if (json.tagRenderings !== undefined) { @@ -933,74 +998,74 @@ export class ValidateLayer extends DesugaringStep { "tagRenderings", new Each( new ValidateTagRenderings(json, this._doesImageExist, { - noQuestionHintCheck: json["#"]?.indexOf("no-question-hint-check") >= 0, + noQuestionHintCheck: json["#"]?.indexOf("no-question-hint-check") >= 0 }) ) - ).convert(json, context) - warnings.push(...(r.warnings ?? [])) - errors.push(...(r.errors ?? [])) - information.push(...(r.information ?? [])) + ).convert(json, context); + warnings.push(...(r.warnings ?? [])); + errors.push(...(r.errors ?? [])); + information.push(...(r.information ?? [])); } { const hasCondition = json.mapRendering?.filter( (mr) => mr["icon"] !== undefined && mr["icon"]["condition"] !== undefined - ) + ); if (hasCondition?.length > 0) { errors.push( "At " + - context + - ":\n One or more icons in the mapRenderings have a condition set. Don't do this, as this will result in an invisible but clickable element. Use extra filters in the source instead. The offending mapRenderings are:\n" + - JSON.stringify(hasCondition, null, " ") - ) + context + + ":\n One or more icons in the mapRenderings have a condition set. Don't do this, as this will result in an invisible but clickable element. Use extra filters in the source instead. The offending mapRenderings are:\n" + + JSON.stringify(hasCondition, null, " ") + ); } } if (json.presets !== undefined) { if (typeof json.source === "string") { - throw "A special layer cannot have presets" + throw "A special layer cannot have presets"; } // Check that a preset will be picked up by the layer itself - const baseTags = TagUtils.Tag(json.source["osmTags"]) + const baseTags = TagUtils.Tag(json.source["osmTags"]); for (let i = 0; i < json.presets.length; i++) { - const preset = json.presets[i] + const preset = json.presets[i]; const tags: { k: string; v: string }[] = new And( preset.tags.map((t) => TagUtils.Tag(t)) - ).asChange({ id: "node/-1" }) - const properties = {} + ).asChange({ id: "node/-1" }); + const properties = {}; for (const tag of tags) { - properties[tag.k] = tag.v + properties[tag.k] = tag.v; } - const doMatch = baseTags.matchesProperties(properties) + const doMatch = baseTags.matchesProperties(properties); if (!doMatch) { errors.push( context + - ".presets[" + - i + - "]: This preset does not match the required tags of this layer. This implies that a newly added point will not show up.\n A newly created point will have properties: " + - JSON.stringify(properties) + - "\n The required tags are: " + - baseTags.asHumanString(false, false, {}) - ) + ".presets[" + + i + + "]: This preset does not match the required tags of this layer. This implies that a newly added point will not show up.\n A newly created point will have properties: " + + JSON.stringify(properties) + + "\n The required tags are: " + + baseTags.asHumanString(false, false, {}) + ); } } } } catch (e) { - errors.push(e) + errors.push(e); } return { result: json, errors, warnings, - information, - } + information + }; } } export class ValidateFilter extends DesugaringStep { constructor() { - super("Detect common errors in the filters", [], "ValidateFilter") + super("Detect common errors in the filters", [], "ValidateFilter"); } convert( @@ -1014,22 +1079,22 @@ export class ValidateFilter extends DesugaringStep { } { if (typeof filter === "string") { // Calling another filter, we skip - return { result: filter } + return { result: filter }; } - const errors = [] + const errors = []; for (const option of filter.options) { for (let i = 0; i < option.fields?.length ?? 0; i++) { - const field = option.fields[i] - const type = field.type ?? "string" + const field = option.fields[i]; + const type = field.type ?? "string"; if (Validators.availableTypes.find((t) => t === type) === undefined) { const err = `Invalid filter: ${type} is not a valid textfield type (at ${context}.fields[${i}])\n\tTry one of ${Array.from( Validators.availableTypes - ).join(",")}` - errors.push(err) + ).join(",")}`; + errors.push(err); } } } - return { result: filter, errors } + return { result: filter, errors }; } } @@ -1042,7 +1107,7 @@ export class DetectDuplicateFilters extends DesugaringStep<{ "Tries to detect layers where a shared filter can be used (or where similar filters occur)", [], "DetectDuplicateFilters" - ) + ); } convert( @@ -1054,11 +1119,11 @@ export class DetectDuplicateFilters extends DesugaringStep<{ warnings?: string[] information?: string[] } { - const errors: string[] = [] - const warnings: string[] = [] - const information: string[] = [] + const errors: string[] = []; + const warnings: string[] = []; + const information: string[] = []; - const { layers, themes } = json + const { layers, themes } = json; const perOsmTag = new Map< string, { @@ -1066,24 +1131,24 @@ export class DetectDuplicateFilters extends DesugaringStep<{ layout: LayoutConfigJson | undefined filter: FilterConfigJson }[] - >() + >(); for (const layer of layers) { - this.addLayerFilters(layer, perOsmTag) + this.addLayerFilters(layer, perOsmTag); } for (const theme of themes) { if (theme.id === "personal") { - continue + continue; } for (const layer of theme.layers) { if (typeof layer === "string") { - continue + continue; } if (layer["builtin"] !== undefined) { - continue + continue; } - this.addLayerFilters(layer, perOsmTag, theme) + this.addLayerFilters(layer, perOsmTag, theme); } } @@ -1091,25 +1156,25 @@ export class DetectDuplicateFilters extends DesugaringStep<{ perOsmTag.forEach((value, key) => { if (value.length <= 1) { // Seen this key just once, it is unique - return + return; } - let msg = "Possible duplicate filter: " + key + let msg = "Possible duplicate filter: " + key; for (const { filter, layer, layout } of value) { - let id = "" + let id = ""; if (layout !== undefined) { - id = layout.id + ":" + id = layout.id + ":"; } - msg += `\n - ${id}${layer.id}.${filter.id}` + msg += `\n - ${id}${layer.id}.${filter.id}`; } - warnings.push(msg) - }) + warnings.push(msg); + }); return { result: json, errors, warnings, - information, - } + information + }; } /** @@ -1128,33 +1193,33 @@ export class DetectDuplicateFilters extends DesugaringStep<{ layout?: LayoutConfigJson | undefined ): void { if (layer.filter === undefined || layer.filter === null) { - return + return; } if (layer.filter["sameAs"] !== undefined) { - return + return; } for (const filter of <(string | FilterConfigJson)[]>layer.filter) { if (typeof filter === "string") { - continue + continue; } if (filter["#"]?.indexOf("ignore-possible-duplicate") >= 0) { - continue + continue; } for (const option of filter.options) { if (option.osmTags === undefined) { - continue + continue; } - const key = JSON.stringify(option.osmTags) + const key = JSON.stringify(option.osmTags); if (!perOsmTag.has(key)) { - perOsmTag.set(key, []) + perOsmTag.set(key, []); } perOsmTag.get(key).push({ layer, filter, - layout, - }) + layout + }); } } } diff --git a/src/UI/i18n/Translation.ts b/src/UI/i18n/Translation.ts index 7a8eb6be3..26fe70806 100644 --- a/src/UI/i18n/Translation.ts +++ b/src/UI/i18n/Translation.ts @@ -233,6 +233,7 @@ export class Translation extends BaseUIElement { * * new Translation({"en": "This is a sentence. This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence" * new Translation({"en": "This is a sentence
This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence" + * new Translation({"en": "This is a sentence
This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence" * new Translation({"en": "This is a sentence with a bold word. This is another sentence"}).FirstSentence().textFor("en") // "This is a sentence with a bold word" * @constructor */ @@ -243,7 +244,7 @@ export class Translation extends BaseUIElement { continue } let txt = this.translations[lng] - txt = txt.replace(/(\.|).*/, "") + txt = txt.replace(/(\.||
).*/, "") txt = Utils.EllipsesAfter(txt, 255) tr[lng] = txt.trim() } diff --git a/src/Utils.ts b/src/Utils.ts index 3a33ce220..9f2f877d7 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -1,5 +1,4 @@ import colors from "./assets/colors.json" -import { HTMLElement } from "node-html-parser" export class Utils { /** @@ -490,7 +489,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be "\nThe value is", v ) - v = (v.InnerConstructElement())?.textContent + v = v.InnerConstructElement()?.textContent } if (typeof v !== "string") { From 4f504d918629306f306acb38c8b3517f96b3e083 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 02:09:39 +0200 Subject: [PATCH 126/134] Chore: reset translations --- langs/layers/ca.json | 11 ++-- langs/layers/cs.json | 6 ++- langs/layers/da.json | 6 ++- langs/layers/de.json | 13 +++-- langs/layers/en.json | 13 +++-- langs/layers/es.json | 6 ++- langs/layers/fr.json | 11 ++-- langs/layers/hu.json | 6 ++- langs/layers/id.json | 13 ++--- langs/layers/it.json | 9 ++-- langs/layers/ja.json | 6 ++- langs/layers/nb_NO.json | 6 ++- langs/layers/nl.json | 13 +++-- langs/layers/pl.json | 6 ++- langs/layers/pt.json | 6 ++- langs/layers/ru.json | 13 ++--- langs/layers/zh_Hant.json | 6 ++- langs/themes/de.json | 106 -------------------------------------- langs/themes/en.json | 12 ++--- langs/themes/fr.json | 59 --------------------- langs/themes/nl.json | 83 ----------------------------- 21 files changed, 105 insertions(+), 305 deletions(-) diff --git a/langs/layers/ca.json b/langs/layers/ca.json index de8bc86b5..647db4d9e 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -351,7 +351,11 @@ }, "artwork-website": { "question": "Hi ha un lloc web amb més informació sobre aquesta obra d'art?", - "render": "Més informació a aquesta pàgina web" + "render": { + "special": { + "text": "Més informació a aquesta pàgina web" + } + } }, "artwork_subject": { "question": "Què representa aquesta obra d'art?", @@ -3580,8 +3584,7 @@ }, "Email": { "question": "A quina adreça de correu electrònic es pot enviar amb preguntes i problemes amb aquest parc natural?", - "questionHint": "Respecteu la privadesa: només ompliu una adreça de correu electrònic personal si es publica àmpliament", - "render": "{email}" + "questionHint": "Respecteu la privadesa: només ompliu una adreça de correu electrònic personal si es publica àmpliament" }, "Name tag": { "render": "Aquesta àrea s'anomena {name}" @@ -5854,7 +5857,7 @@ "verified-mastodon": { "mappings": { "0": { - "then": "S'ha trobat un enllaç al vostre perfil de Mastodon: {_mastodon_link}" + "then": "S'ha trobat un enllaç al vostre perfil de Mastodon: {_mastodon_link}" } } } diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 521179bca..4c2da9751 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -351,7 +351,11 @@ }, "artwork-website": { "question": "Existuje webová stránka s dalšími informacemi o tomto uměleckém díle?", - "render": "Více informací na této webové stránce" + "render": { + "special": { + "text": "Více informací na této webové stránce" + } + } }, "artwork_subject": { "question": "Co zobrazuje toto umělecké dílo?", diff --git a/langs/layers/da.json b/langs/layers/da.json index 20e0d008f..7e5f7982c 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -130,7 +130,11 @@ }, "artwork-website": { "question": "Er der et websted med mere information om dette kunstværk?", - "render": "Yderligere oplysninger på dette websted" + "render": { + "special": { + "text": "Yderligere oplysninger på dette websted" + } + } } }, "title": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 894e1a797..42a6eed90 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -351,7 +351,11 @@ }, "artwork-website": { "question": "Auf welcher Webseite gibt es weitere Informationen zum Kunstwerk?", - "render": "Weitere Informationen auf dieser Webseite" + "render": { + "special": { + "text": "Weitere Informationen auf dieser Webseite" + } + } }, "artwork_subject": { "question": "Was zeigt dieses Kunstwerk?", @@ -6071,8 +6075,7 @@ }, "Email": { "question": "An welche Email-Adresse kann man sich bei Fragen und Problemen zu diesem Gebiet wenden?", - "questionHint": "Respektieren Sie die Privatsphäre. Geben Sie nur dann eine persönliche Email-Adresse an, wenn diese allgemein bekannt ist", - "render": "{email}" + "questionHint": "Respektieren Sie die Privatsphäre. Geben Sie nur dann eine persönliche Email-Adresse an, wenn diese allgemein bekannt ist" }, "Name tag": { "mappings": { @@ -9649,10 +9652,10 @@ "verified-mastodon": { "mappings": { "0": { - "then": "Es wurde ein Link zu deinem Mastodon-Profil gefunden: {_mastodon_link}" + "then": "Es wurde ein Link zu deinem Mastodon-Profil gefunden: {_mastodon_link}" }, "1": { - "then": "Wir haben einen Link gefunden, der aussieht wie ein Mastodon-Konto, aber nicht verifiziert ist. Bearbeiten Sie Ihre Profilbeschreibung und fügen Sie dort Folgendes ein: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" + "then": "Wir haben einen Link gefunden, der aussieht wie ein Mastodon-Konto, aber nicht verifiziert ist. Bearbeiten Sie Ihre Profilbeschreibung und fügen Sie dort Folgendes ein: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" } } } diff --git a/langs/layers/en.json b/langs/layers/en.json index e3acffc5d..0e180493e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -351,7 +351,11 @@ }, "artwork-website": { "question": "Is there a website with more information about this artwork?", - "render": "More information on this website" + "render": { + "special": { + "text": "More information on this website" + } + } }, "artwork_subject": { "question": "What does this artwork depict?", @@ -6091,8 +6095,7 @@ }, "Email": { "question": "What email adress can one send to with questions and problems with this nature reserve?", - "questionHint": "Respect privacy - only fill out a personal email address if this is widely published", - "render": "{email}" + "questionHint": "Respect privacy - only fill out a personal email address if this is widely published" }, "Name tag": { "mappings": { @@ -9686,10 +9689,10 @@ "verified-mastodon": { "mappings": { "0": { - "then": "A link to your Mastodon-profile has been been found: {_mastodon_link}" + "then": "A link to your Mastodon-profile has been been found: {_mastodon_link}" }, "1": { - "then": "We found a link to what looks to be a mastodon account, but it is unverified. Edit your profile description and place the following there: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" + "then": "We found a link to what looks to be a mastodon account, but it is unverified. Edit your profile description and place the following there: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" } } } diff --git a/langs/layers/es.json b/langs/layers/es.json index 7253988f4..984e8131e 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -351,7 +351,11 @@ }, "artwork-website": { "question": "¿Hay un sitio web con más información sobre esta obra de arte?", - "render": "Más información en este sitio web" + "render": { + "special": { + "text": "Más información en este sitio web" + } + } }, "artwork_subject": { "question": "¿Qué representa esta obra de arte?", diff --git a/langs/layers/fr.json b/langs/layers/fr.json index fa04bb6b7..37b9aa295 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -335,7 +335,11 @@ }, "artwork-website": { "question": "Existe-t-il un site web où trouver plus d'informations sur cette œuvre d'art ?", - "render": "Plus d'info sûr ce site web" + "render": { + "special": { + "text": "Plus d'info sûr ce site web" + } + } }, "artwork_subject": { "question": "Que représente cette oeuvre d'art ?", @@ -3879,8 +3883,7 @@ }, "Email": { "question": "À quelle adresse courriel peut-on envoyer des questions et des problèmes concernant cette réserve naturelle ? ", - "questionHint": "Respecter la vie privée – renseignez une adresse électronique personnelle seulement si celle-ci est largement publiée", - "render": "{email}" + "questionHint": "Respecter la vie privée – renseignez une adresse électronique personnelle seulement si celle-ci est largement publiée" }, "Surface area": { "render": "Superficie : {_surface:ha} ha" @@ -6008,7 +6011,7 @@ "verified-mastodon": { "mappings": { "0": { - "then": "Un lien vers votre profil Mastodon a été trouvé : {_mastodon_link}" + "then": "Un lien vers votre profil Mastodon a été trouvé : {_mastodon_link}" } } } diff --git a/langs/layers/hu.json b/langs/layers/hu.json index 1b2e6ef41..44c9e796c 100644 --- a/langs/layers/hu.json +++ b/langs/layers/hu.json @@ -130,7 +130,11 @@ }, "artwork-website": { "question": "Van-e olyan honlap, amely további információkat tartalmaz erről a műalkotásról?", - "render": "További információ ezen a weboldalon" + "render": { + "special": { + "text": "További információ ezen a weboldalon" + } + } } }, "title": { diff --git a/langs/layers/id.json b/langs/layers/id.json index fc28c3edf..ff82e7cdd 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -81,7 +81,11 @@ }, "artwork-website": { "question": "Adakah situs web mengenai informasi lebih lanjut tentang karya seni ini?", - "render": "Info lanjut tersedia di laman web ini" + "render": { + "special": { + "text": "Info lanjut tersedia di laman web ini" + } + } } }, "title": { @@ -369,13 +373,6 @@ } } }, - "nature_reserve": { - "tagRenderings": { - "Email": { - "render": "{email}" - } - } - }, "playground": { "tagRenderings": { "playground-email": { diff --git a/langs/layers/it.json b/langs/layers/it.json index d3066d329..84bc390b5 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -105,7 +105,11 @@ }, "artwork-website": { "question": "Esiste un sito web con maggiori informazioni su quest’opera?", - "render": "Ulteriori informazioni su questo sito web" + "render": { + "special": { + "text": "Ulteriori informazioni su questo sito web" + } + } } }, "title": { @@ -1513,8 +1517,7 @@ }, "Email": { "question": "Qual è l’indirizzo email a cui scrivere per fare domande o segnalare problemi su questa riserva naturale?", - "questionHint": "Rispetta la privacy (compila l’indirizzo email personale solo se è stato reso pubblico)", - "render": "{email}" + "questionHint": "Rispetta la privacy (compila l’indirizzo email personale solo se è stato reso pubblico)" }, "Surface area": { "render": "Area: {_surface:ha} ha" diff --git a/langs/layers/ja.json b/langs/layers/ja.json index 71997d053..eb2c414f2 100644 --- a/langs/layers/ja.json +++ b/langs/layers/ja.json @@ -105,7 +105,11 @@ }, "artwork-website": { "question": "この作品についての詳しい情報はどのウェブサイトにありますか?", - "render": "Webサイトに詳細情報がある" + "render": { + "special": { + "text": "Webサイトに詳細情報がある" + } + } } }, "title": { diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json index cb139d8ec..d073d3e7e 100644 --- a/langs/layers/nb_NO.json +++ b/langs/layers/nb_NO.json @@ -101,7 +101,11 @@ }, "artwork-website": { "question": "Finnes det en nettside med mer info om dette kunstverket?", - "render": "Mer info er å finne på denne nettsiden" + "render": { + "special": { + "text": "Mer info er å finne på denne nettsiden" + } + } }, "artwork_subject": { "render": "Dette kunstverket viser {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 6a602b03f..4fa39eed5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -247,7 +247,11 @@ }, "artwork-website": { "question": "Is er een website met meer informatie over dit kunstwerk?", - "render": "Meer informatie op deze website" + "render": { + "special": { + "text": "Meer informatie op deze website" + } + } }, "artwork_subject": { "question": "Wat beeldt dit kunstwerk af?", @@ -5682,8 +5686,7 @@ }, "Email": { "question": "Waar kan men naartoe emailen voor vragen en meldingen van dit natuurgebied?", - "questionHint": "Respecteer privacy - geef enkel persoonlijke emailadressen als deze elders zijn gepubliceerd", - "render": "{email}" + "questionHint": "Respecteer privacy - geef enkel persoonlijke emailadressen als deze elders zijn gepubliceerd" }, "Name tag": { "mappings": { @@ -8948,10 +8951,10 @@ "verified-mastodon": { "mappings": { "0": { - "then": "Een link naar je Mastodon-profiel werd gevonden: {_mastodon_link}" + "then": "Een link naar je Mastodon-profiel werd gevonden: {_mastodon_link}" }, "1": { - "then": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.Pas je profielbeschrijving aan en plaats er de volgende code: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" + "then": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.Pas je profielbeschrijving aan en plaats er de volgende code: <a href=\"{_mastodon_candidate}\" rel=\"me\">Mastodon</a>" } } } diff --git a/langs/layers/pl.json b/langs/layers/pl.json index 39de5004f..8be04a2f7 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -79,7 +79,11 @@ }, "artwork-website": { "question": "Gdzie znajdę więcej informacji na temat tego dzieła sztuki?", - "render": "Więcej informacji na tej stronie" + "render": { + "special": { + "text": "Więcej informacji na tej stronie" + } + } } }, "title": { diff --git a/langs/layers/pt.json b/langs/layers/pt.json index c9719c968..0b555ee2d 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -233,7 +233,11 @@ }, "artwork-website": { "question": "Existe um site com mais informações sobre esta obra de arte?", - "render": "Mais informações neste site" + "render": { + "special": { + "text": "Mais informações neste site" + } + } }, "artwork_subject": { "question": "O que esta obra de arte representa?", diff --git a/langs/layers/ru.json b/langs/layers/ru.json index e2b6cbb1b..b32efc029 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -117,7 +117,11 @@ }, "artwork-website": { "question": "Есть ли сайт с более подробной информацией об этой работе?", - "render": "Больше информации на этом сайте" + "render": { + "special": { + "text": "Больше информации на этом сайте" + } + } } }, "title": { @@ -1299,13 +1303,6 @@ } } }, - "nature_reserve": { - "tagRenderings": { - "Email": { - "render": "{email}" - } - } - }, "observation_tower": { "name": "Смотровые башни", "title": { diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index 82fb3ca3b..1b07031cf 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -72,7 +72,11 @@ }, "artwork-website": { "question": "在那個網站能夠找到更多藝術品的資訊？", - "render": "這個網站有更多資訊" + "render": { + "special": { + "text": "這個網站有更多資訊" + } + } } }, "title": { diff --git a/langs/themes/de.json b/langs/themes/de.json index e64d44abe..6052fc55f 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -854,112 +854,6 @@ }, "title": "Bordsteine und Überwege" }, - "mapcomplete-changes": { - "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "layers": { - "0": { - "description": "Alle MapComplete-Änderungen anzeigen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themenname enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Erstellt von {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nicht erstellt von {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Erstellt vor {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Erstellt nach {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Benutzersprache (ISO-Code) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Erstellt mit Host {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Changeset fügte mindestens ein Bild hinzu" - } - } - } - }, - "name": "Zentrum der Änderungssätze", - "tagRenderings": { - "contributor": { - "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "render": "Änderung gemacht von {user}" - }, - "host": { - "question": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", - "render": "Änderung vorgenommen mit {host}" - }, - "locale": { - "question": "In welcher Sprache wurde diese Änderung vorgenommen?", - "render": "Usersprache ist {locale}" - }, - "show_changeset_id": { - "render": "Änderungssatz {id}" - }, - "theme-id": { - "question": "Welches Thema wurde für diese Änderung verwendet?", - "render": "Geändert mit Thema {theme}" - }, - "version": { - "question": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", - "render": "Erstellt mit {editor}" - } - }, - "title": { - "render": "Änderungssatz für {theme}" - } - }, - "1": { - "override": { - "tagRenderings+": { - "0": { - "render": "Mehr Statistiken gibt es hier" - } - } - } - } - }, - "shortDescription": "Mit MapComplete erstellte Änderungen anzeigen", - "title": "Mit MapComplete erstellte Änderungen" - }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/en.json b/langs/themes/en.json index d07b53164..ca9c5a4f9 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -858,12 +858,12 @@ "description": "This maps shows all the changes made with MapComplete", "layers": { "0": { - "description": "Show all MapComplete changes", + "description": "Shows all MapComplete changes", "filter": { "0": { "options": { "0": { - "question": "Theme name contains {search}" + "question": "Themename contains {search}" } } }, @@ -920,12 +920,12 @@ "name": "Changeset centers", "tagRenderings": { "contributor": { - "question": "Which contributor made this change?", + "question": "What contributor did make this change?", "render": "Change made by {user}" }, "host": { "question": "What host (website) was this change made with?", - "render": "Change made with {host}" + "render": "Change with with {host}" }, "locale": { "question": "What locale (language) was this change made in?", @@ -936,7 +936,7 @@ }, "theme-id": { "question": "What theme was used to make this change?", - "render": "Change with theme {theme}" + "render": "Change with theme {theme}" }, "version": { "question": "What version of MapComplete was used to make this change?", @@ -957,7 +957,7 @@ } } }, - "shortDescription": "Show changes made with MapComplete", + "shortDescription": "Shows changes made by MapComplete", "title": "Changes made with MapComplete" }, "maproulette": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 21da83331..1154031d0 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -844,65 +844,6 @@ }, "title": "Ressauts et traversées" }, - "mapcomplete-changes": { - "description": "Cette carte montre tous les changements faits avec MapComplete", - "layers": { - "0": { - "filter": { - "5": { - "options": { - "0": { - "question": "Langage utilisateur (code-ISO) {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Le groupe de modifications a ajouté au moins une image" - } - } - } - }, - "tagRenderings": { - "contributor": { - "question": "Quel contributeur a fait cette modification ?", - "render": "Modification faite par {user}" - }, - "host": { - "render": "Modification faite avec {host}" - }, - "locale": { - "question": "En quelle langue est-ce que ce changement a été fait ?" - }, - "show_changeset_id": { - "render": "Groupe de modifications {id}" - }, - "theme-id": { - "question": "Quel thème a été utilisé pour faire cette modification ?", - "render": "Modifié avec le thème {theme}" - }, - "version": { - "question": "Quelle version de MapComplete a été utilisée pour faire cette modification ?", - "render": "Fait avec {editor}" - } - }, - "title": { - "render": "Groupe de modifications pour {theme}" - } - }, - "1": { - "override": { - "tagRenderings+": { - "0": { - "render": "D'autres statistiques sont disponibles ici" - } - } - } - } - }, - "title": "Changements faits avec MapComplete" - }, "maproulette": { "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "title": "Tâches MapRoulette" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 2affa3f47..8344d4fba 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -936,89 +936,6 @@ }, "title": "Stoepranden en oversteekplaatsen" }, - "mapcomplete-changes": { - "description": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden", - "layers": { - "0": { - "description": "Toon alle MapComplete wijzigingen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themenaam bevat {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Gemaakt door bijdrager {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Niet gemaakt door bijdrager {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Gemaakt voor {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Gemaakt na {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "De taal van de bijdrager is {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Gemaakt met host {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Changeset bevat minstens één afbeelding" - } - } - } - }, - "name": "Centerpunt van changeset", - "tagRenderings": { - "contributor": { - "question": "Welke bijdrager maakte deze wijziging?", - "render": "Wijziging gemaakt door {user}" - }, - "host": { - "question": "Met welke host (website) werd deze wijziging gemaakt?", - "render": "Wijziging gemaakt met {host}" - }, - "locale": { - "question": "In welke locale (taal) werd deze wijziging gemaakt?", - "render": "De gebruikerstaal is {locale}" - } - } - } - }, - "shortDescription": "Toon wijzigingen gemaakt met MapComplete", - "title": "Wijzigingen gemaakt met MapComplete" - }, "maproulette": { "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.", "title": "MapRoulette taken" From 8473b714516a0fefb2b41bdf7d49b49942747c3f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 02:10:25 +0200 Subject: [PATCH 127/134] Chore: reset translations --- .../mapcomplete-changes.json | 114 +++++++++++++----- langs/themes/de.json | 106 ++++++++++++++++ langs/themes/en.json | 12 +- langs/themes/fr.json | 59 +++++++++ langs/themes/nl.json | 83 +++++++++++++ 5 files changed, 341 insertions(+), 33 deletions(-) diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index dabbec8e1..3bd0b3b29 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,21 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "fr": "Changements faits avec MapComplete", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "fr": "Cette carte montre tous les changements faits avec MapComplete", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +28,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +41,57 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}", + "fr": "Groupe de modifications pour {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}", + "fr": "Groupe de modifications {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "fr": "Quel contributeur a fait cette modification ?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "fr": "Modification faite par {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?", + "fr": "Quel thème a été utilisé pour faire cette modification ?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}", + "fr": "Modifié avec le thème {theme}" } }, { @@ -74,19 +100,29 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "fr": "En quelle langue est-ce que ce changement a été fait ?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "fr": "Modification faite avec {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +143,14 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "fr": "Quelle version de MapComplete a été utilisée pour faire cette modification ?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}", + "fr": "Fait avec {editor}" }, "freeform": { "key": "editor" @@ -452,7 +492,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +510,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +528,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +547,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +566,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +584,10 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "fr": "Langage utilisateur (code-ISO) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +603,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +616,10 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "fr": "Le groupe de modifications a ajouté au moins une image", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +634,9 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier", + "fr": "D'autres statistiques sont disponibles ici" } }, { @@ -606,4 +666,4 @@ } } ] -} \ No newline at end of file +} diff --git a/langs/themes/de.json b/langs/themes/de.json index 6052fc55f..e64d44abe 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -854,6 +854,112 @@ }, "title": "Bordsteine und Überwege" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "layers": { + "0": { + "description": "Alle MapComplete-Änderungen anzeigen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Erstellt vor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Erstellt nach {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Benutzersprache (ISO-Code) {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Erstellt mit Host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset fügte mindestens ein Bild hinzu" + } + } + } + }, + "name": "Zentrum der Änderungssätze", + "tagRenderings": { + "contributor": { + "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "render": "Änderung gemacht von {user}" + }, + "host": { + "question": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "render": "Änderung vorgenommen mit {host}" + }, + "locale": { + "question": "In welcher Sprache wurde diese Änderung vorgenommen?", + "render": "Usersprache ist {locale}" + }, + "show_changeset_id": { + "render": "Änderungssatz {id}" + }, + "theme-id": { + "question": "Welches Thema wurde für diese Änderung verwendet?", + "render": "Geändert mit Thema {theme}" + }, + "version": { + "question": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "render": "Erstellt mit {editor}" + } + }, + "title": { + "render": "Änderungssatz für {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "Mehr Statistiken gibt es hier" + } + } + } + } + }, + "shortDescription": "Mit MapComplete erstellte Änderungen anzeigen", + "title": "Mit MapComplete erstellte Änderungen" + }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/en.json b/langs/themes/en.json index ca9c5a4f9..d07b53164 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -858,12 +858,12 @@ "description": "This maps shows all the changes made with MapComplete", "layers": { "0": { - "description": "Shows all MapComplete changes", + "description": "Show all MapComplete changes", "filter": { "0": { "options": { "0": { - "question": "Themename contains {search}" + "question": "Theme name contains {search}" } } }, @@ -920,12 +920,12 @@ "name": "Changeset centers", "tagRenderings": { "contributor": { - "question": "What contributor did make this change?", + "question": "Which contributor made this change?", "render": "Change made by {user}" }, "host": { "question": "What host (website) was this change made with?", - "render": "Change with with {host}" + "render": "Change made with {host}" }, "locale": { "question": "What locale (language) was this change made in?", @@ -936,7 +936,7 @@ }, "theme-id": { "question": "What theme was used to make this change?", - "render": "Change with theme {theme}" + "render": "Change with theme {theme}" }, "version": { "question": "What version of MapComplete was used to make this change?", @@ -957,7 +957,7 @@ } } }, - "shortDescription": "Shows changes made by MapComplete", + "shortDescription": "Show changes made with MapComplete", "title": "Changes made with MapComplete" }, "maproulette": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 1154031d0..21da83331 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -844,6 +844,65 @@ }, "title": "Ressauts et traversées" }, + "mapcomplete-changes": { + "description": "Cette carte montre tous les changements faits avec MapComplete", + "layers": { + "0": { + "filter": { + "5": { + "options": { + "0": { + "question": "Langage utilisateur (code-ISO) {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Le groupe de modifications a ajouté au moins une image" + } + } + } + }, + "tagRenderings": { + "contributor": { + "question": "Quel contributeur a fait cette modification ?", + "render": "Modification faite par {user}" + }, + "host": { + "render": "Modification faite avec {host}" + }, + "locale": { + "question": "En quelle langue est-ce que ce changement a été fait ?" + }, + "show_changeset_id": { + "render": "Groupe de modifications {id}" + }, + "theme-id": { + "question": "Quel thème a été utilisé pour faire cette modification ?", + "render": "Modifié avec le thème {theme}" + }, + "version": { + "question": "Quelle version de MapComplete a été utilisée pour faire cette modification ?", + "render": "Fait avec {editor}" + } + }, + "title": { + "render": "Groupe de modifications pour {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "D'autres statistiques sont disponibles ici" + } + } + } + } + }, + "title": "Changements faits avec MapComplete" + }, "maproulette": { "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "title": "Tâches MapRoulette" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8344d4fba..2affa3f47 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -936,6 +936,89 @@ }, "title": "Stoepranden en oversteekplaatsen" }, + "mapcomplete-changes": { + "description": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden", + "layers": { + "0": { + "description": "Toon alle MapComplete wijzigingen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenaam bevat {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Gemaakt door bijdrager {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Niet gemaakt door bijdrager {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Gemaakt voor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Gemaakt na {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "De taal van de bijdrager is {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Gemaakt met host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset bevat minstens één afbeelding" + } + } + } + }, + "name": "Centerpunt van changeset", + "tagRenderings": { + "contributor": { + "question": "Welke bijdrager maakte deze wijziging?", + "render": "Wijziging gemaakt door {user}" + }, + "host": { + "question": "Met welke host (website) werd deze wijziging gemaakt?", + "render": "Wijziging gemaakt met {host}" + }, + "locale": { + "question": "In welke locale (taal) werd deze wijziging gemaakt?", + "render": "De gebruikerstaal is {locale}" + } + } + } + }, + "shortDescription": "Toon wijzigingen gemaakt met MapComplete", + "title": "Wijzigingen gemaakt met MapComplete" + }, "maproulette": { "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.", "title": "MapRoulette taken" From 2e99d37646c94b7d7e92070c82f346b753f20724 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 2 Sep 2023 11:34:44 +0200 Subject: [PATCH 128/134] Test with overriding through environment variables --- .gitignore | 1 + src/Logic/Osm/OsmConnection.ts | 60 ++++++++++++++++++++++------------ tsconfig.json | 3 +- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 41f172fe8..a9dcf16ad 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ index_*.ts .~lock.* *.doctest.ts service-worker.js +.env .vscode/* !.vscode/settings.json diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 76c419761..b4b47d68e 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -1,9 +1,9 @@ // @ts-ignore -import {osmAuth} from "osm-auth" -import {Store, Stores, UIEventSource} from "../UIEventSource" -import {OsmPreferences} from "./OsmPreferences" -import {Utils} from "../../Utils" -import {LocalStorageSource} from "../Web/LocalStorageSource"; +import { osmAuth } from "osm-auth" +import { Store, Stores, UIEventSource } from "../UIEventSource" +import { OsmPreferences } from "./OsmPreferences" +import { Utils } from "../../Utils" +import { LocalStorageSource } from "../Web/LocalStorageSource" import * as config from "../../../package.json" export default class UserDetails { public loggedIn = false @@ -34,7 +34,8 @@ export interface AuthConfig { export type OsmServiceState = "online" | "readonly" | "offline" | "unknown" | "unreachable" export class OsmConnection { - public static readonly oauth_configs: Record = config.config.oauth_credentials + public static readonly oauth_configs: Record = + config.config.oauth_credentials public auth public userDetails: UIEventSource public isLoggedIn: Store @@ -75,6 +76,19 @@ export class OsmConnection { console.debug("Using backend", this._oauth_config.url) this._iframeMode = Utils.runningFromConsole ? false : window !== window.top + // Check if there are settings available in environment variables, and if so, use those + if ( + import.meta.env.VITE_OSM_OAUTH_CLIENT_ID !== undefined && + import.meta.env.VITE_OSM_OAUTH_SECRET !== undefined + ) { + console.debug("Using environment variables for oauth config") + this._oauth_config = { + oauth_client_id: import.meta.env.VITE_OSM_OAUTH_CLIENT_ID, + oauth_secret: import.meta.env.VITE_OSM_OAUTH_SECRET, + url: "https://www.openstreetmap.org", + } + } + this.userDetails = new UIEventSource( new UserDetails(this._oauth_config.url), "userDetails" @@ -182,7 +196,9 @@ export class OsmConnection { const self = this console.log("Trying to log in...") this.updateAuthObject() - LocalStorageSource.Get("location_before_login").setData(Utils.runningFromConsole ? undefined : window.location.href) + LocalStorageSource.Get("location_before_login").setData( + Utils.runningFromConsole ? undefined : window.location.href + ) this.auth.xhr( { method: "GET", @@ -195,7 +211,7 @@ export class OsmConnection { if (err.status == 401) { console.log("Clearing tokens...") // Not authorized - our token probably got revoked - self.auth.logout(); + self.auth.logout() self.LogOut() } return @@ -240,7 +256,7 @@ export class OsmConnection { if (homeEl !== undefined && homeEl[0] !== undefined) { const lat = parseFloat(homeEl[0].getAttribute("lat")) const lon = parseFloat(homeEl[0].getAttribute("lon")) - data.home = {lat: lat, lon: lon} + data.home = { lat: lat, lon: lon } } self.loadingStatus.setData("logged-in") @@ -344,13 +360,13 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually opening note with text ", text) return new Promise<{ id: number }>((ok) => { window.setTimeout( - () => ok({id: Math.floor(Math.random() * 1000)}), + () => ok({ id: Math.floor(Math.random() * 1000) }), Math.random() * 5000 ) }) } const auth = this.auth - const content = {lat, lon, text} + const content = { lat, lon, text } const response = await this.post("notes.json", JSON.stringify(content), { "Content-Type": "application/json", }) @@ -378,7 +394,7 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually uploading GPX ", gpx) return new Promise<{ id: number }>((ok, error) => { window.setTimeout( - () => ok({id: Math.floor(Math.random() * 1000)}), + () => ok({ id: Math.floor(Math.random() * 1000) }), Math.random() * 5000 ) }) @@ -419,7 +435,7 @@ export class OsmConnection { }) const parsed = JSON.parse(response) console.log("Uploaded GPX track", parsed) - return {id: parsed} + return { id: parsed } } public addCommentToNote(id: number | string, text: string): Promise { @@ -478,7 +494,9 @@ export class OsmConnection { client_id: this._oauth_config.oauth_client_id, url: this._oauth_config.url, scope: "read_prefs write_prefs write_api write_gpx write_notes", - redirect_uri: Utils.runningFromConsole ? "https://mapcomplete.org/land.html" : window.location.protocol + "//" + window.location.host + "/land.html", + redirect_uri: Utils.runningFromConsole + ? "https://mapcomplete.org/land.html" + : window.location.protocol + "//" + window.location.host + "/land.html", singlepage: !standalone, auto: true, }) @@ -487,13 +505,13 @@ export class OsmConnection { /** * To be called by land.html */ - public finishLogin(callback: ((previousURL: string) => void)) { - this.auth.authenticate(function() { + public finishLogin(callback: (previousURL: string) => void) { + this.auth.authenticate(function () { // Fully authed at this point console.log("Authentication successful!") const previousLocation = LocalStorageSource.Get("location_before_login") callback(previousLocation.data) - }); + }) } private CheckForMessagesContinuously() { @@ -512,7 +530,7 @@ export class OsmConnection { private UpdateCapabilities(): void { const self = this - this.FetchCapabilities().then(({api, gpx}) => { + this.FetchCapabilities().then(({ api, gpx }) => { self.apiIsOnline.setData(api) self.gpxServiceIsOnline.setData(gpx) }) @@ -520,18 +538,18 @@ export class OsmConnection { private async FetchCapabilities(): Promise<{ api: OsmServiceState; gpx: OsmServiceState }> { if (Utils.runningFromConsole) { - return {api: "online", gpx: "online"} + return { api: "online", gpx: "online" } } const result = await Utils.downloadAdvanced(this.Backend() + "/api/0.6/capabilities") if (result["content"] === undefined) { console.log("Something went wrong:", result) - return {api: "unreachable", gpx: "unreachable"} + return { api: "unreachable", gpx: "unreachable" } } const xmlRaw = result["content"] const parsed = new DOMParser().parseFromString(xmlRaw, "text/xml") const statusEl = parsed.getElementsByTagName("status")[0] const api = statusEl.getAttribute("api") const gpx = statusEl.getAttribute("gpx") - return {api, gpx} + return { api, gpx } } } diff --git a/tsconfig.json b/tsconfig.json index 293116044..e491c3572 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,8 @@ "resolveJsonModule": true, "isolatedModules": true, "esModuleInterop": true, - "skipLibCheck": true + "skipLibCheck": true, + "types": ["vite/client"] }, "ts-node": { "esm": true, From 6717fbdb91216ba263df41747fd220b63310f11e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 31 Aug 2023 23:52:23 +0200 Subject: [PATCH 129/134] Update nvmrc file --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 132d0eed6..06e751596 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -nodejs 16.9.1 \ No newline at end of file +16.9.1 From 8acaafe307826ac682f25eaa0b188278ca4056fe Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 14:10:11 +0200 Subject: [PATCH 130/134] Themes: elevators: first ask if there is speech output/tactile writing before asking the relative languages --- assets/layers/elevator/elevator.json | 37 +++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 6893d452c..e2d370127 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -140,10 +140,25 @@ } }, "induction-loop", + + {"id": "tactile_writing_available", + "question": {"en": "Has this elevator tactile writing?"}, + + "mappings":[ + {"if":"tactile_writing:braille=yes", + "then": {"en": "This elevator has tactile writing in Braille"} + }, + {"if":"tactile_writing:braille=no", + "then": {"en": "This elevator does not have tactile writing"} + } + ] + } + { "id": "tactile_writing_language", + "condition": "tactile_writing:braille=yes", "render": { - "special": { + "special": e{ "type": "language_chooser", "key": "tactile_writing:braille", "question": { @@ -164,8 +179,22 @@ } } }, + {"id": "speech_output_available", + "question": {"en": "Has this elevator speech output?"}, + "questionHint": {"en": "E.g. it announces the current floor"}, + "mappings":[ + {"if":"speech_output=yes", + "then": {"en": "This elevator has speech output"} + }, + {"if":"speech_output=no", + "then": {"en": "This elevator does not have speech output"} + } + ] + } + { "id": "speech_output", + "condition": "speech_output=yes", "render": { "special": { "type": "language_chooser", @@ -202,7 +231,8 @@ "if": { "or": [ "operational_status=broken", - "operational_status=closed" + "operat + ional_status=closed" ] }, "then": "close:#c33" @@ -235,7 +265,8 @@ "defaultInput": "cm", "applicableUnits": [ { - "canonicalDenomination": "m", + "canonicalDenomination": "m" + , "alternativeDenomination": [ "meter" ], From 374a4eb22211ecfbe8a04569d89b8236f109b8ed Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 14:14:24 +0200 Subject: [PATCH 131/134] fix: typo in elevator.json --- assets/layers/elevator/elevator.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index e2d370127..dde566bb8 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -158,7 +158,7 @@ "id": "tactile_writing_language", "condition": "tactile_writing:braille=yes", "render": { - "special": e{ + "special": { "type": "language_chooser", "key": "tactile_writing:braille", "question": { From 79d8732e750f3a6c6339b7be7cdb8be6bb37a5fd Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 14:16:40 +0200 Subject: [PATCH 132/134] Fix typo: Update elevator.json --- assets/layers/elevator/elevator.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index dde566bb8..815820ac1 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -231,8 +231,7 @@ "if": { "or": [ "operational_status=broken", - "operat - ional_status=closed" + "operational_status=closed" ] }, "then": "close:#c33" From 07d0e9d27fe3acbd35bcd9c922eaf0955005be0d Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 2 Sep 2023 14:16:40 +0200 Subject: [PATCH 133/134] Add reference to env variables --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ff3e61eeb..fc0e5fe90 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "`oauth_credentials` are the OAuth-2 credentials for the production-OSM server and the test-server.", "Are you deploying your own instance? Register your application too.", "See https://wiki.openstreetmap.org/wiki/OAuth#Registering_your_application_as_OAuth_2.0_consumer for instructions", - "Use `https:////land.html` as redirect URIs. You can add `http://127.0.0.1:1234/land.html` too for local development." + "Use `https:////land.html` as redirect URIs. You can add `http://127.0.0.1:1234/land.html` too for local development.", + "Alternatively, you can override the `osm` credentials using the environment variables `VITE_OSM_OAUTH_CLIENT_ID` and `VITE_OSM_OAUTH_SECRET`" ], "oauth_credentials": { "osm_pietervdvn": { @@ -186,4 +187,4 @@ "typescript": "^4.7.4", "vite": "^4.0.5" } -} +} \ No newline at end of file From 229e60538b4d9002875a63ad877324941dd4647d Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 2 Sep 2023 14:20:53 +0200 Subject: [PATCH 134/134] Fix: missing commas in elevator.json --- assets/layers/elevator/elevator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 815820ac1..d27464d7e 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -152,7 +152,7 @@ "then": {"en": "This elevator does not have tactile writing"} } ] - } + }, { "id": "tactile_writing_language", @@ -190,7 +190,7 @@ "then": {"en": "This elevator does not have speech output"} } ] - } + }, { "id": "speech_output",