diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 3c83df001..08c75c1dc 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -427,6 +427,7 @@ - entrance - fitness_centre - food + - hackerspace - parking - picnic_table - railway_platforms @@ -684,6 +685,7 @@ - cluster_style + - fixme @@ -731,6 +733,7 @@ - etymology + - hackerspace - play_forest - playground - shops diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md index ee0bebfd5..df5aa5b94 100644 --- a/Docs/BuiltinLayers.md +++ b/Docs/BuiltinLayers.md @@ -451,7 +451,7 @@ Elements must have the all of following tags to be shown on this layer: - - id~.+ + - date_created~.+ @@ -968,6 +968,7 @@ The following layers are included in MapComplete: - [fire_station](./Layers/fire_station.md) - [fitness_centre](./Layers/fitness_centre.md) - [fitness_station](./Layers/fitness_station.md) + - [fixme](./Layers/fixme.md) - [food](./Layers/food.md) - [ghost_bike](./Layers/ghost_bike.md) - [governments](./Layers/governments.md) diff --git a/Docs/Layers/advertising.md b/Docs/Layers/advertising.md index a85d9a7fe..a1a527525 100644 --- a/Docs/Layers/advertising.md +++ b/Docs/Layers/advertising.md @@ -181,7 +181,7 @@ The question is *What kind of message is shown?* - Unselecting this answer will add - *Local information* corresponds with `message=local` - Unselecting this answer will add - - *Securty information* corresponds with `message=safety` + - *Security information* corresponds with `message=safety` - Unselecting this answer will add - *Electoral advertising* corresponds with `message=political` - Unselecting this answer will add diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md index 6aad555a4..58588320c 100644 --- a/Docs/Layers/artwork.md +++ b/Docs/Layers/artwork.md @@ -15,6 +15,7 @@ An open map of statues, busts, graffitis and other artwork all over the world - This layer is shown at zoomlevel **12** and higher + - This layer will automatically load [walls_and_buildings](./walls_and_buildings.md) into the layout as it depends on it: a preset snaps to this layer (presets[1]) diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md index 59efb276e..afc5d0feb 100644 --- a/Docs/Layers/atm.md +++ b/Docs/Layers/atm.md @@ -208,7 +208,7 @@ This tagrendering is only visible in the popup if the following condition is met id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/bank.md b/Docs/Layers/bank.md index c6291208e..b79deb213 100644 --- a/Docs/Layers/bank.md +++ b/Docs/Layers/bank.md @@ -90,7 +90,7 @@ The question is *Does this bank have an ATM?* id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/banks_with_atm.md b/Docs/Layers/banks_with_atm.md index d6139e364..8c0d9bfd6 100644 --- a/Docs/Layers/banks_with_atm.md +++ b/Docs/Layers/banks_with_atm.md @@ -115,7 +115,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md index cfc2da80f..ee38b026e 100644 --- a/Docs/Layers/bicycle_rental.md +++ b/Docs/Layers/bicycle_rental.md @@ -100,11 +100,11 @@ The question is *What kind of bicycle rental is this?* - *This is a shop whose main focus is bicycle rental* corresponds with `shop=rental&bicycle_rental=shop` - - *This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus* corresponds with `shop=rental` + - *This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus* corresponds with `shop=rental` - *This is a shop which sells or repairs bicycles, but also rents out bicycles* corresponds with `service:bicycle:rental=yes&shop=bicycle` - - *This is an automated docking station, where a bicycle is mechanically locked into a structure* corresponds with `bicycle_rental=docking_station` + - *This is an automated docking station, where a bicycle is mechanically locked to a structure* corresponds with `bicycle_rental=docking_station` - *A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby* corresponds with `bicycle_rental=key_dispensing_machine` - - *This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only* corresponds with `bicycle_rental=dropoff_point` + - *This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only* corresponds with `bicycle_rental=dropoff_point` This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental` @@ -261,7 +261,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much city bikes can be rented here?* +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) @@ -279,7 +279,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much electrical bikes can be rented here?* +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) @@ -297,7 +297,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bikes for children can be rented here?* +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) @@ -315,7 +315,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much BMX bikes can be rented here?* +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) @@ -333,11 +333,11 @@ This tagrendering has labels `bicycle_rental` -The question is *How much mountainbike can be rented here?* +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} mountainbike can be rented here` +This is rendered with `{capacity:mtb} mountainbikes can be rented here` @@ -351,7 +351,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bicycle panniers can be rented here?* +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) @@ -369,7 +369,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much tandem can be rented here?* +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) diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md index 5e01025e1..355d96343 100644 --- a/Docs/Layers/bicycle_rental_non_docking.md +++ b/Docs/Layers/bicycle_rental_non_docking.md @@ -99,11 +99,11 @@ The question is *What kind of bicycle rental is this?* - *This is a shop whose main focus is bicycle rental* corresponds with `shop=rental&bicycle_rental=shop` - - *This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus* corresponds with `shop=rental` + - *This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus* corresponds with `shop=rental` - *This is a shop which sells or repairs bicycles, but also rents out bicycles* corresponds with `service:bicycle:rental=yes&shop=bicycle` - - *This is an automated docking station, where a bicycle is mechanically locked into a structure* corresponds with `bicycle_rental=docking_station` + - *This is an automated docking station, where a bicycle is mechanically locked to a structure* corresponds with `bicycle_rental=docking_station` - *A machine is present which dispenses and accepts keys, eventually after authentication and/or payment. The bicycles are parked nearby* corresponds with `bicycle_rental=key_dispensing_machine` - - *This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only* corresponds with `bicycle_rental=dropoff_point` + - *This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only* corresponds with `bicycle_rental=dropoff_point` This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental` @@ -260,7 +260,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much city bikes can be rented here?* +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) @@ -278,7 +278,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much electrical bikes can be rented here?* +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) @@ -296,7 +296,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bikes for children can be rented here?* +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) @@ -314,7 +314,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much BMX bikes can be rented here?* +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) @@ -332,11 +332,11 @@ This tagrendering has labels `bicycle_rental` -The question is *How much mountainbike can be rented here?* +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} mountainbike can be rented here` +This is rendered with `{capacity:mtb} mountainbikes can be rented here` @@ -350,7 +350,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bicycle panniers can be rented here?* +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) @@ -368,7 +368,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much tandem can be rented here?* +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) diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md index 80f0240a5..bae4a6e6f 100644 --- a/Docs/Layers/bike_cafe.md +++ b/Docs/Layers/bike_cafe.md @@ -119,7 +119,7 @@ The question is *Does this bike cafe offer a bike pump for use by anyone?* -The question is *Are there tools here to repair your own bike?* +The question is *Are tools offered to repair your own bike?* diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md index f7dd3441c..5100b6e24 100644 --- a/Docs/Layers/bike_parking.md +++ b/Docs/Layers/bike_parking.md @@ -105,7 +105,7 @@ This is rendered with `This is a bicycle parking of the type: {bicycle_parking} - *Two-tiered* corresponds with `bicycle_parking=two_tier` - *Shed* corresponds with `bicycle_parking=shed` - *Bollard* corresponds with `bicycle_parking=bollard` - - *An area on the floor which is marked for bicycle parking* corresponds with `bicycle_parking=floor` + - *An area on the floor which is marked for bicycle parking* corresponds with `bicycle_parking=floor` diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 5ca275fcf..58c6c04b2 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -303,7 +303,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much city bikes can be rented here?* +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) @@ -321,7 +321,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much electrical bikes can be rented here?* +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) @@ -339,7 +339,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bikes for children can be rented here?* +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) @@ -357,7 +357,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much BMX bikes can be rented here?* +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) @@ -375,11 +375,11 @@ This tagrendering has labels `bicycle_rental` -The question is *How much mountainbike can be rented here?* +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} mountainbike can be rented here` +This is rendered with `{capacity:mtb} mountainbikes can be rented here` @@ -393,7 +393,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much bicycle panniers can be rented here?* +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) @@ -411,7 +411,7 @@ This tagrendering has labels `bicycle_rental` -The question is *How much tandem can be rented here?* +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) @@ -524,6 +524,33 @@ This rendering asks information about the property [description](https://wiki.o This is rendered with `{description}` + + + + +#### Filters + + + + + +id | question | osmTags +---- | ---------- | --------- +open_now.0 | Open now | _isOpen=yes + + + + +id | question | osmTags +---- | ---------- | --------- +sells_second-hand.0 | Sells second-hand bicycles | service:bicycle:second_hand=yes\|service:bicycle:second_hand=only + + + + +id | question | osmTags +---- | ---------- | --------- +offers_diy_repair.0 | Offers DIY bike repair | service:bicycle:diy=yes\|service:bicycle:diy=only This document is autogenerated from [assets/layers/bike_shop/bike_shop.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_shop/bike_shop.json) diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index 9a83203c2..f81e38843 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -393,7 +393,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/car_rental.md b/Docs/Layers/car_rental.md index 230f666f5..f509bd7d2 100644 --- a/Docs/Layers/car_rental.md +++ b/Docs/Layers/car_rental.md @@ -170,7 +170,7 @@ This is rendered with `

Opening hours

{opening_hours_table(opening_hours id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/car_rental/car_rental.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/car_rental/car_rental.json) diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md index 60e7a2e08..17f1481f4 100644 --- a/Docs/Layers/defibrillator.md +++ b/Docs/Layers/defibrillator.md @@ -361,7 +361,7 @@ has_image.2 | Probably does not have an image | id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/defibrillator/defibrillator.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/defibrillator/defibrillator.json) diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md index 8eb382ff2..f93c21f2f 100644 --- a/Docs/Layers/dentist.md +++ b/Docs/Layers/dentist.md @@ -177,7 +177,7 @@ This is rendered with `This dentist is called {name}` id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/dentist/dentist.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/dentist/dentist.json) diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md index ec2e6148d..d0b9cc30c 100644 --- a/Docs/Layers/doctors.md +++ b/Docs/Layers/doctors.md @@ -208,7 +208,7 @@ This is rendered with `This doctor is specialized in {healthcare:speciality}` id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/doctors/doctors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/doctors/doctors.json) diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md index d897c2894..9e2ac0335 100644 --- a/Docs/Layers/dogfoodb.md +++ b/Docs/Layers/dogfoodb.md @@ -658,7 +658,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md index 221ce62e6..2eeada8e1 100644 --- a/Docs/Layers/dogshop.md +++ b/Docs/Layers/dogshop.md @@ -555,7 +555,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/elevator.md b/Docs/Layers/elevator.md index 0d90eac28..34a8f87d5 100644 --- a/Docs/Layers/elevator.md +++ b/Docs/Layers/elevator.md @@ -194,6 +194,16 @@ The question is *Does this place have an audio induction loop for people with r This tagrendering has no question and is thus read-only + + + + +### speech_output + + + +This tagrendering has no question and is thus read-only + This document is autogenerated from [assets/layers/elevator/elevator.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/elevator/elevator.json) diff --git a/Docs/Layers/filters.md b/Docs/Layers/filters.md index 5fc43fe3c..2f3374afe 100644 --- a/Docs/Layers/filters.md +++ b/Docs/Layers/filters.md @@ -53,7 +53,7 @@ Elements must have the all of following tags to be shown on this layer: id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md index efa8df020..ffc60372c 100644 --- a/Docs/Layers/fitness_centre.md +++ b/Docs/Layers/fitness_centre.md @@ -239,7 +239,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/fitness_centre/fitness_centre.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/fitness_centre/fitness_centre.json) diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md index 9be0aaf08..8db9aa98a 100644 --- a/Docs/Layers/fitness_station.md +++ b/Docs/Layers/fitness_station.md @@ -174,7 +174,7 @@ This is rendered with `

Opening hours

{opening_hours_table(opening_hours id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/fitness_station/fitness_station.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/fitness_station/fitness_station.json) diff --git a/Docs/Layers/fixme.md b/Docs/Layers/fixme.md new file mode 100644 index 000000000..1cb129d24 --- /dev/null +++ b/Docs/Layers/fixme.md @@ -0,0 +1,90 @@ +[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) + + fixme +======= + + + + + +OSM objects that likely need to be fixed, based on a FIXME tag. + + + + + + + - This layer is shown at zoomlevel **12** and higher + - This layer is not visible by default and must be enabled in the filter by the user. + + + + +#### Themes using this layer + + + + + + - [notes](https://mapcomplete.osm.be/notes) + - [personal](https://mapcomplete.osm.be/personal) + + + + + Basic tags for this layer +--------------------------- + + + +Elements must have the all of following tags to be shown on this layer: + + + + - fixme~.+|FIXME~.+ + + +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22FIXME%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22fixme%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) + + + + Supported attributes +---------------------- + + + + + +### fixme + + + +This tagrendering has no question and is thus read-only + + + + + +### note + + + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `note~.+` + + + +### all_tags + + + +Shows a table with all the tags of the feature + +This tagrendering has no question and is thus read-only + + + +This document is autogenerated from [assets/layers/fixme/fixme.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/fixme/fixme.json) diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md index 3e3726ada..17c24f219 100644 --- a/Docs/Layers/food.md +++ b/Docs/Layers/food.md @@ -637,7 +637,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md index 8b463a582..f49815f3b 100644 --- a/Docs/Layers/friture.md +++ b/Docs/Layers/friture.md @@ -658,7 +658,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md index 1e84616fc..1ce4bda9c 100644 --- a/Docs/Layers/hackerspace.md +++ b/Docs/Layers/hackerspace.md @@ -62,6 +62,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/hackerspace#values) [hackerspace](https://wiki.openstreetmap.org/wiki/Key:hackerspace) | Multiple choice | [makerspace](https://wiki.openstreetmap.org/wiki/Tag:hackerspace%3Dmakerspace) [](https://wiki.openstreetmap.org/wiki/Tag:hackerspace%3D) [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | +[](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/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) | @@ -118,6 +119,31 @@ This is rendered with `This hackerspace is named {name}` +### 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` + + + + ### website @@ -245,18 +271,6 @@ The question is *Is a CNC drill available at this hackerspace?* -### reviews - - - -Shows the reviews module (including the possibility to leave a review) - -This tagrendering has no question and is thus read-only - - - - - ### wheelchair-access @@ -301,6 +315,28 @@ This rendering asks information about the property [start_date](https://wiki.op This is rendered with `This hackerspace was founded at {start_date}` + + + + +### questions + + + +This tagrendering has no question and is thus read-only + + + + + +### reviews + + + +Shows the reviews module (including the possibility to leave a review) + +This tagrendering has no question and is thus read-only + This document is autogenerated from [assets/layers/hackerspace/hackerspace.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/hackerspace/hackerspace.json) diff --git a/Docs/Layers/maproulette_challenge.md b/Docs/Layers/maproulette_challenge.md index 0d8929b22..de57d43ce 100644 --- a/Docs/Layers/maproulette_challenge.md +++ b/Docs/Layers/maproulette_challenge.md @@ -7,7 +7,7 @@ -Layer showing tasks of a single MapRoulette challenge. This layer is intended to be reused and extended in themes; refer to the documentation on how to do this. +Layer showing tasks of a single MapRoulette challenge. This layer is intended to be reused and extended in themes; refer to [the documentation](https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Integrating_Maproulette.md) on how to do this. diff --git a/Docs/Layers/medical-shops.md b/Docs/Layers/medical-shops.md index 60ac0f13e..517f6c31d 100644 --- a/Docs/Layers/medical-shops.md +++ b/Docs/Layers/medical-shops.md @@ -555,7 +555,7 @@ This tagrendering has no question and is thus read-only id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md index d6e5c3ec4..912d77909 100644 --- a/Docs/Layers/parcel_lockers.md +++ b/Docs/Layers/parcel_lockers.md @@ -195,7 +195,7 @@ This tagrendering is only visible in the popup if the following condition is met id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/parcel_lockers/parcel_lockers.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/parcel_lockers/parcel_lockers.json) diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md index 74c893985..ad8d4d01b 100644 --- a/Docs/Layers/pharmacy.md +++ b/Docs/Layers/pharmacy.md @@ -211,7 +211,7 @@ dispensing.0 | Pharmacy able to provide prescription drugs | dispensing=yes id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/pharmacy/pharmacy.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/pharmacy/pharmacy.json) diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md index dbd2ee02d..69604b82b 100644 --- a/Docs/Layers/physiotherapist.md +++ b/Docs/Layers/physiotherapist.md @@ -184,7 +184,7 @@ This is rendered with `](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/barrier#values) [barrier](https://wiki.openstreetmap.org/wiki/Key:barrier) | Multiple choice | [gate](https://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate) -[](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [Nederlandse Spoorwegen](https://wiki.openstreetmap.org/wiki/Tag:operator%3DNederlandse Spoorwegen) @@ -123,6 +123,11 @@ This is rendered with `This ticket validator is operated by {operator}` + - *Dutch Railways (NS)* corresponds with `operator=Nederlandse Spoorwegen` + + + + ### payment-options diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index 130ff8482..74868582e 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -387,7 +387,7 @@ free.0 | Free to use | fee=no\|fee=0|charge=0 id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/toilet/toilet.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/toilet/toilet.json) diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md index df443602c..4065379e2 100644 --- a/Docs/Layers/toilet_at_amenity.md +++ b/Docs/Layers/toilet_at_amenity.md @@ -350,7 +350,7 @@ free.0 | Free to use | toilets:fee=no\|toilets:fee=0|toilets:charge=0 id | question | osmTags ---- | ---------- | --------- -open_now.0 | Opened now | _isOpen=yes +open_now.0 | Open now | _isOpen=yes This document is autogenerated from [assets/layers/toilet_at_amenity/toilet_at_amenity.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/toilet_at_amenity/toilet_at_amenity.json) diff --git a/Docs/Layers/walls_and_buildings.md b/Docs/Layers/walls_and_buildings.md index 6e9ffbab6..bc94001ea 100644 --- a/Docs/Layers/walls_and_buildings.md +++ b/Docs/Layers/walls_and_buildings.md @@ -21,6 +21,7 @@ Special builtin layer providing all walls and buildings. This layer is useful in - Not rendered on the map by default. If you want to rendering this on the map, override `mapRenderings` - This layer will automatically load [entrance](./entrance.md) into the layout as it depends on it: a calculated tag loads features from this layer (calculatedTag[0] which calculates the value for _entrance_properties) - This layer is needed as dependency for layer [advertising](#advertising) + - This layer is needed as dependency for layer [artwork](#artwork) - This layer is needed as dependency for layer [clock](#clock) - This layer is needed as dependency for layer [defibrillator](#defibrillator) - This layer is needed as dependency for layer [entrance](#entrance) @@ -37,6 +38,7 @@ Special builtin layer providing all walls and buildings. This layer is useful in - [advertising](https://mapcomplete.osm.be/advertising) - [aed](https://mapcomplete.osm.be/aed) + - [artwork](https://mapcomplete.osm.be/artwork) - [clock](https://mapcomplete.osm.be/clock) - [indoors](https://mapcomplete.osm.be/indoors) - [onwheels](https://mapcomplete.osm.be/onwheels) diff --git a/Docs/TagInfo/mapcomplete_advertising.json b/Docs/TagInfo/mapcomplete_advertising.json index 844b221b4..408eb448f 100644 --- a/Docs/TagInfo/mapcomplete_advertising.json +++ b/Docs/TagInfo/mapcomplete_advertising.json @@ -165,7 +165,7 @@ }, { "key": "message", - "description": "Layer 'Advertise' shows message=safety with a fixed text, namely 'Securty information' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Advertising Map')", + "description": "Layer 'Advertise' shows message=safety with a fixed text, namely 'Security information' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Advertising Map')", "value": "safety" }, { diff --git a/Docs/TagInfo/mapcomplete_bicycle_rental.json b/Docs/TagInfo/mapcomplete_bicycle_rental.json index ff4d615f8..24738d9c0 100644 --- a/Docs/TagInfo/mapcomplete_bicycle_rental.json +++ b/Docs/TagInfo/mapcomplete_bicycle_rental.json @@ -56,7 +56,7 @@ }, { "key": "shop", - "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", "value": "rental" }, { @@ -71,7 +71,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked into a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked to a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", "value": "docking_station" }, { @@ -81,7 +81,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if amenity=bicycle_rental)", "value": "dropoff_point" }, { diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index d1e360101..7ecd89a0f 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -451,7 +451,7 @@ }, { "key": "shop", - "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", "value": "rental" }, { @@ -466,7 +466,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked into a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked to a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", "value": "docking_station" }, { @@ -476,7 +476,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity=bicycle_rental)", "value": "dropoff_point" }, { @@ -1300,7 +1300,7 @@ }, { "key": "bicycle_parking", - "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", "value": "floor" }, { diff --git a/Docs/TagInfo/mapcomplete_hackerspaces.json b/Docs/TagInfo/mapcomplete_hackerspaces.json index 13b041b9e..81288314a 100644 --- a/Docs/TagInfo/mapcomplete_hackerspaces.json +++ b/Docs/TagInfo/mapcomplete_hackerspaces.json @@ -45,6 +45,35 @@ "key": "name", "description": "Layer 'Hackerspace' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Hackerspaces')" }, + { + "key": "level", + "description": "Layer 'Hackerspace' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Hackerspaces')" + }, + { + "key": "location", + "description": "Layer 'Hackerspace' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Hackerspaces')", + "value": "underground" + }, + { + "key": "level", + "description": "Layer 'Hackerspace' 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 'Hackerspaces')", + "value": "0" + }, + { + "key": "level", + "description": "Layer 'Hackerspace' shows with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Hackerspaces') Picking this answer will delete the key level.", + "value": "" + }, + { + "key": "level", + "description": "Layer 'Hackerspace' 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 'Hackerspaces')", + "value": "1" + }, + { + "key": "level", + "description": "Layer 'Hackerspace' 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 'Hackerspaces')", + "value": "-1" + }, { "key": "website", "description": "Layer 'Hackerspace' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Hackerspaces')" diff --git a/Docs/TagInfo/mapcomplete_notes.json b/Docs/TagInfo/mapcomplete_notes.json index f9874de7e..4c1c6a164 100644 --- a/Docs/TagInfo/mapcomplete_notes.json +++ b/Docs/TagInfo/mapcomplete_notes.json @@ -6,8 +6,17 @@ "project_url": "https://mapcomplete.osm.be/notes", "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/", "icon_url": "https://mapcomplete.osm.be/assets/themes/notes/logo.svg", - "contact_name": "Pieter Vander Vennet, MapComplete", + "contact_name": "Pieter Vander Vennet", "contact_email": "pietervdvn@posteo.net" }, - "tags": [] + "tags": [ + { + "key": "fixme", + "description": "The MapComplete theme Notes on OpenStreetMap has a layer OSM objects with FIXME tags showing features with this tag" + }, + { + "key": "FIXME", + "description": "The MapComplete theme Notes on OpenStreetMap has a layer OSM objects with FIXME tags showing features with this tag" + } + ] } \ No newline at end of file diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 9488bda20..c7b067746 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -165,7 +165,7 @@ }, { "key": "message", - "description": "Layer 'Advertise' shows message=safety with a fixed text, namely 'Securty information' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Advertise' shows message=safety with a fixed text, namely 'Security information' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "safety" }, { @@ -1213,7 +1213,7 @@ }, { "key": "shop", - "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental buisiness which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows shop=rental with a fixed text, namely 'This is a rental business which rents out various objects and/or vehicles. It rents out bicycles too, but this is not the main focus' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", "value": "rental" }, { @@ -1228,7 +1228,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked into a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=docking_station with a fixed text, namely 'This is an automated docking station, where a bicycle is mechanically locked to a structure' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", "value": "docking_station" }, { @@ -1238,7 +1238,7 @@ }, { "key": "bicycle_rental", - "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", + "description": "Layer 'Bicycle rental' shows bicycle_rental=dropoff_point with a fixed text, namely 'This is a dropoff point, e.g. a reserved parking to place the bicycles clearly marked as being for the rental service only' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity=bicycle_rental)", "value": "dropoff_point" }, { @@ -1736,7 +1736,7 @@ }, { "key": "bicycle_parking", - "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "floor" }, { @@ -6533,6 +6533,14 @@ "key": "opening_hours", "description": "Layer 'Fitness Stations' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "fixme", + "description": "The MapComplete theme Personal theme has a layer OSM objects with FIXME tags showing features with this tag" + }, + { + "key": "FIXME", + "description": "The MapComplete theme Personal theme has a layer OSM objects with FIXME tags showing features with this tag" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer Restaurants and fast food showing features with this tag", @@ -7144,6 +7152,35 @@ "key": "name", "description": "Layer 'Hackerspace' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "level", + "description": "Layer 'Hackerspace' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "location", + "description": "Layer 'Hackerspace' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "underground" + }, + { + "key": "level", + "description": "Layer 'Hackerspace' 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 'Hackerspace' 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 'Hackerspace' 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 'Hackerspace' 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": "website", "description": "Layer 'Hackerspace' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')" @@ -9453,6 +9490,16 @@ "description": "Layer 'Recycling' shows amenity=waste_disposal with a fixed text, namely 'Waste disposal container for residual waste' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "waste_disposal" }, + { + "key": "recycling_type", + "description": "Layer 'Recycling' shows recycling_type=pickup_point with a fixed text, namely 'This is a pickup point. The waste material is placed here without placing it in a dedicated container.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "pickup_point" + }, + { + "key": "recycling_type", + "description": "Layer 'Recycling' shows recycling_type=dump with a fixed text, namely 'This is a dump where the waste material is stacked.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "dump" + }, { "key": "name", "description": "Layer 'Recycling' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if recycling_type=centre)" @@ -9597,6 +9644,11 @@ "description": "Layer 'Recycling' shows recycling:waste=yes with a fixed text, namely 'Residual waste can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "yes" }, + { + "key": "recycling:bicycles", + "description": "Layer 'Recycling' shows recycling:bicycles=yes with a fixed text, namely 'Bicycles can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "operator", "description": "Layer 'Recycling' shows and asks freeform values for key 'operator' (in the MapComplete.osm.be theme 'Personal theme')" diff --git a/Docs/TagInfo/mapcomplete_transit.json b/Docs/TagInfo/mapcomplete_transit.json index fabe4e638..9494bedcd 100644 --- a/Docs/TagInfo/mapcomplete_transit.json +++ b/Docs/TagInfo/mapcomplete_transit.json @@ -260,7 +260,7 @@ }, { "key": "bicycle_parking", - "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bus routes')", + "description": "Layer 'Bike parking' shows bicycle_parking=floor with a fixed text, namely 'An area on the floor which is marked for bicycle parking' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bus routes')", "value": "floor" }, { diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index c74705743..c5c27a23c 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -127,6 +127,16 @@ "description": "Layer 'Recycling' shows amenity=waste_disposal with a fixed text, namely 'Waste disposal container for residual waste' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "waste_disposal" }, + { + "key": "recycling_type", + "description": "Layer 'Recycling' shows recycling_type=pickup_point with a fixed text, namely 'This is a pickup point. The waste material is placed here without placing it in a dedicated container.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "pickup_point" + }, + { + "key": "recycling_type", + "description": "Layer 'Recycling' shows recycling_type=dump with a fixed text, namely 'This is a dump where the waste material is stacked.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "dump" + }, { "key": "name", "description": "Layer 'Recycling' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Waste') (This is only shown if recycling_type=centre)" @@ -271,6 +281,11 @@ "description": "Layer 'Recycling' shows recycling:waste=yes with a fixed text, namely 'Residual waste can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "yes" }, + { + "key": "recycling:bicycles", + "description": "Layer 'Recycling' shows recycling:bicycles=yes with a fixed text, namely 'Bicycles can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "yes" + }, { "key": "operator", "description": "Layer 'Recycling' shows and asks freeform values for key 'operator' (in the MapComplete.osm.be theme 'Waste')" diff --git a/Docs/Themes/artwork.md b/Docs/Themes/artwork.md index f080b829d..9449dad6d 100644 --- a/Docs/Themes/artwork.md +++ b/Docs/Themes/artwork.md @@ -11,6 +11,7 @@ This theme contains the following layers: + - [walls_and_buildings](../Layers/walls_and_buildings.md) - [artwork](../Layers/artwork.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) diff --git a/Docs/Themes/notes.md b/Docs/Themes/notes.md index 9196f6b91..47bb77fe7 100644 --- a/Docs/Themes/notes.md +++ b/Docs/Themes/notes.md @@ -12,6 +12,7 @@ This theme contains the following layers: - [note](../Layers/note.md) + - [fixme](../Layers/fixme.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) - [gps_location_history](../Layers/gps_location_history.md) diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md index 1bdd36b39..0e3822f8a 100644 --- a/Docs/Themes/personal.md +++ b/Docs/Themes/personal.md @@ -52,6 +52,7 @@ This theme contains the following layers: - [fire_station](../Layers/fire_station.md) - [fitness_centre](../Layers/fitness_centre.md) - [fitness_station](../Layers/fitness_station.md) + - [fixme](../Layers/fixme.md) - [food](../Layers/food.md) - [ghost_bike](../Layers/ghost_bike.md) - [governments](../Layers/governments.md) diff --git a/Docs/Themes/stations.md b/Docs/Themes/stations.md index 977f96a22..d5a53a14a 100644 --- a/Docs/Themes/stations.md +++ b/Docs/Themes/stations.md @@ -30,7 +30,9 @@ This theme contains the following layers: - [elevator](../Layers/elevator.md) - [waste_basket](../Layers/waste_basket.md) - [atm](../Layers/atm.md) + - [clock](../Layers/clock.md) - [bench](../Layers/bench.md) + - [drinking_water](../Layers/drinking_water.md) - [departures_board](../Layers/departures_board.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) diff --git a/Docs/Themes/trees.md b/Docs/Themes/trees.md index 803745347..857b59bc8 100644 --- a/Docs/Themes/trees.md +++ b/Docs/Themes/trees.md @@ -40,6 +40,7 @@ Available languages: - da - pa_PK - cs + - pt_BR This document is autogenerated from [assets/themes/trees/trees.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/trees/trees.json) diff --git a/assets/contributors.json b/assets/contributors.json index 6128020e0..b2effbd6a 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 5262, + "commits": 5306, "contributor": "Pieter Vander Vennet" }, { - "commits": 352, + "commits": 359, "contributor": "Robin van der Linde" }, { @@ -32,6 +32,10 @@ "commits": 30, "contributor": "paunofu" }, + { + "commits": 26, + "contributor": "riQQ" + }, { "commits": 26, "contributor": "Joost" @@ -40,10 +44,6 @@ "commits": 26, "contributor": "karelleketers" }, - { - "commits": 25, - "contributor": "riQQ" - }, { "commits": 24, "contributor": "Ward" @@ -74,11 +74,11 @@ }, { "commits": 18, - "contributor": "Arno Deceuninck" + "contributor": "dependabot[bot]" }, { - "commits": 17, - "contributor": "dependabot[bot]" + "commits": 18, + "contributor": "Arno Deceuninck" }, { "commits": 17, @@ -112,6 +112,10 @@ "commits": 10, "contributor": "LiamSimons" }, + { + "commits": 8, + "contributor": "Mateusz Konieczny" + }, { "commits": 8, "contributor": "Thibault Molleman" @@ -122,11 +126,11 @@ }, { "commits": 7, - "contributor": "OliNau" + "contributor": "Codain" }, { "commits": 7, - "contributor": "Mateusz Konieczny" + "contributor": "OliNau" }, { "commits": 7, @@ -148,10 +152,6 @@ "commits": 6, "contributor": "pelderson" }, - { - "commits": 5, - "contributor": "Codain" - }, { "commits": 4, "contributor": "Nadhem" @@ -172,6 +172,10 @@ "commits": 3, "contributor": "Léo Villeveygoux" }, + { + "commits": 2, + "contributor": "Paul Brunner" + }, { "commits": 2, "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" @@ -220,6 +224,10 @@ "commits": 2, "contributor": "Stanislas Gueniffey" }, + { + "commits": 1, + "contributor": "brunnerpaul" + }, { "commits": 1, "contributor": "flaburgan" diff --git a/assets/language_in_country.json b/assets/language_in_country.json index 2a5ae1375..5c08e9878 100644 --- a/assets/language_in_country.json +++ b/assets/language_in_country.json @@ -502,7 +502,8 @@ "en" ], "PK": [ - "ur" + "ur", + "en" ], "PL": [ "pl", diff --git a/assets/language_translations.json b/assets/language_translations.json index 31b29b302..c20af4ce3 100644 --- a/assets/language_translations.json +++ b/assets/language_translations.json @@ -2776,6 +2776,7 @@ "NZ", "PG", "PH", + "PK", "PW", "RW", "SB", diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index a156ff96b..fc18756bb 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -287,10 +287,10 @@ "then": { "en": "Schuko wall plug without ground pin (CEE7/4 type F)", "nl": "Schuko stekker zonder aardingspin (CEE7/4 type F)", + "ca": "Endoll de paret Schuko sense pin a terra (CEE7/4 tipus F)", "da": "Schuko vægstik uden jordstift (CEE7/4 type F)", "de": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)", - "es": "Enchufe de pared Schuko sin pin de tierra (CEE7/4 tipo F)", - "ca": "Endoll de paret Schuko sense pin a terra (CEE7/4 tipus F)" + "es": "Enchufe de pared Schuko sin pin de tierra (CEE7/4 tipo F)" }, "icon": { "path": "./assets/layers/charging_station/CEE7_4F.svg", @@ -319,10 +319,10 @@ "then": { "en": "Schuko wall plug without ground pin (CEE7/4 type F)", "nl": "Schuko stekker zonder aardingspin (CEE7/4 type F)", + "ca": "Endoll de paret Schuko sense pin a terra (CEE7/4 tipus F)", "da": "Schuko vægstik uden jordstift (CEE7/4 type F)", "de": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)", - "es": "Enchufe de pared Schuko sin pin de tierra (CEE7/4 tipo F)", - "ca": "Endoll de paret Schuko sense pin a terra (CEE7/4 tipus F)" + "es": "Enchufe de pared Schuko sin pin de tierra (CEE7/4 tipo F)" }, "hideInAnswer": true, "icon": { @@ -860,10 +860,10 @@ "then": { "en": "Type 2 with cable (mennekes)", "nl": "Type 2 met kabel (J1772)", + "ca": "Tipus 2 amb cable (mennekes)", "da": "Type 2 med kabel (mennekes)", "de": "Typ 2 mit Kabel (mennekes)", - "es": "Tipo 2 con cable (mennekes)", - "ca": "Tipus 2 amb cable (mennekes)" + "es": "Tipo 2 con cable (mennekes)" }, "hideInAnswer": true, "icon": { @@ -923,10 +923,10 @@ "then": { "en": "Tesla Supercharger CCS (a branded type2_css)", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo)", + "ca": "CSS Supercarregador Tesla (un tipus2_css de la marca)", "da": "Tesla Supercharger CCS (en mærkevare type2_css)", "de": "Tesla Supercharger CCS (ein Markenzeichen von type2_css)", - "es": "CCS Supercargador Tesla (un tipo2_css con marca)", - "ca": "CSS Supercarregador Tesla (un tipus2_css de la marca)" + "es": "CCS Supercargador Tesla (un tipo2_css con marca)" }, "hideInAnswer": true, "icon": { @@ -940,10 +940,10 @@ "then": { "en": "Tesla Supercharger (destination)", "nl": "Tesla Supercharger (destination)", + "ca": "Supercarregador Tesla (destí)", "da": " Tesla Supercharger (destination)", "de": "Tesla Supercharger (Destination)", - "es": "Supercargador Tesla (destino", - "ca": "Supercarregador Tesla (destí)" + "es": "Supercargador Tesla (destino" }, "icon": { "path": "./assets/layers/charging_station/Tesla-hpwc-model-s.svg", @@ -992,10 +992,10 @@ "then": { "en": "Tesla Supercharger (destination)", "nl": "Tesla Supercharger (destination)", + "ca": "Supercarregador Tesla (destí)", "da": " Tesla Supercharger (destination)", "de": "Tesla Supercharger (Destination)", - "es": "Supercargador Tesla (destino)", - "ca": "Supercarregador Tesla (destí)" + "es": "Supercargador Tesla (destino)" }, "hideInAnswer": true, "icon": { @@ -1397,14 +1397,14 @@ "question": { "en": "How much plugs of type
Type 2 (mennekes)
are available here?", "nl": "Hoeveel stekkers van type
Type 2 (mennekes)
heeft dit oplaadpunt?", - "de": "Wie viele Stecker des Typs
Typ 2 (Mennekes)
sind hier vorhanden?", - "ca": "Quants endolls del tipus
Tipus 2 (mennekes)
hi ha disponibles aquí?" + "ca": "Quants endolls del tipus
Tipus 2 (mennekes)
hi ha disponibles aquí?", + "de": "Wie viele Stecker des Typs
Typ 2 (Mennekes)
sind hier vorhanden?" }, "render": { "en": "There are {socket:type2} plugs of type
Type 2 (mennekes)
available here", "nl": "Hier zijn {socket:type2} stekkers van het type
Type 2 (mennekes)
", - "de": "Hier sind {socket:type2} Stecker des Typs
Typ 2 (Mennekes)
vorhanden", - "ca": "Hi ha {socket:type2} endolls del tipus
Tipus 2 (mennekes)
disponibles aquí" + "ca": "Hi ha {socket:type2} endolls del tipus
Tipus 2 (mennekes)
disponibles aquí", + "de": "Hier sind {socket:type2} Stecker des Typs
Typ 2 (Mennekes)
vorhanden" }, "freeform": { "key": "socket:type2", @@ -3560,18 +3560,18 @@ "question": { "en": "What current do the plugs with
USB to charge phones and small electronics
offer?", "nl": "Welke stroom levert de stekker van type
USB om GSMs en kleine electronica op te laden
?", + "ca": "Quina corrent ofereixen els connectors amb
USBper a carrega telèfons i dispositius electrònics petits
?", "da": "Hvilken strømstyrke har stikkene med
USB til opladning af telefoner og småt elektronikudstyr
?", "de": "Welche Stromstärke liefern die Stecker mit
USB zum Laden von Handys und kleinen Elektrogeräten
?", - "es": "¿Qué corriente ofrecen los conectores con
USB para cargar teléfonos y dispositivos electrónicos pequeños
?", - "ca": "Quina corrent ofereixen els connectors amb
USBper a carrega telèfons i dispositius electrònics petits
?" + "es": "¿Qué corriente ofrecen los conectores con
USB para cargar teléfonos y dispositivos electrónicos pequeños
?" }, "render": { "en": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:current}A", "nl": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal {socket:USB-A:current}A", + "ca": "
USBper a carregar telèfons i petits dispositius electrònics
com a màxim a {socket:USB-A:current}A", "da": "
USB til opladning af telefoner og småt elektronikudstyr
udsender højst {socket:USB-A:current}A", "de": "
USB zum Aufladen von Telefonen und kleinen Elektrogeräten
liefert maximal {socket:USB-A:current} A", - "es": "
USB para carga teléfonos y dispositivos electrónicos pequeños
salida de hasta {socket:USB-A:current}A", - "ca": "
USBper a carregar telèfons i petits dispositius electrònics
com a màxim a {socket:USB-A:current}A" + "es": "
USB para carga teléfonos y dispositivos electrónicos pequeños
salida de hasta {socket:USB-A:current}A" }, "freeform": { "key": "socket:USB-A:current", @@ -3583,10 +3583,10 @@ "then": { "en": "USB to charge phones and small electronics outputs at most 1 A", "nl": "USB om GSMs en kleine electronica op te laden levert een stroom van maximaal 1 A", + "ca": "USB per a carregar telèfons i dispositius petits fins a 1 A", "da": "USB til opladning af telefoner og mindre elektronik yder højst 1 A", "de": "USB zum Laden von Handys und kleinen Elektrogeräten liefert maximal 1 A", - "es": "USB para cargar teléfonos y dispositivos electrónicos pequeños hasta 1 A", - "ca": "USB per a carregar telèfons i dispositius petits fins a 1 A" + "es": "USB para cargar teléfonos y dispositivos electrónicos pequeños hasta 1 A" }, "icon": { "path": "./assets/layers/charging_station/usb_port.svg", @@ -3598,10 +3598,10 @@ "then": { "en": "USB to charge phones and small electronics outputs at most 2 A", "nl": "USB om GSMs en kleine electronica op te laden levert een stroom van maximaal 2 A", + "ca": "USB per a carregar telèfons i dispositius petits fins a 2 A", "da": "USB til opladning af telefoner og små elektroniske apparater yder højst 2 A", "de": "USB zum Laden von Handys und kleinen Elektrogeräten liefert maximal 2 A", - "es": "USB para cargar teléfonos y dispositivos electrónicos pequeños hasta 1 A", - "ca": "USB per a carregar telèfons i dispositius petits fins a 2 A" + "es": "USB para cargar teléfonos y dispositivos electrónicos pequeños hasta 1 A" }, "icon": { "path": "./assets/layers/charging_station/usb_port.svg", @@ -3965,11 +3965,11 @@ "question": { "en": "What kind of authentication is available at the charging station?", "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?", + "ca": "Quin tipus d'autenticació hi ha disponible a l'estació de càrrega?", "da": "Hvilken form for godkendelse er tilgængelig ved ladestationen?", "de": "Welche Art der Authentifizierung ist an der Ladestation möglich?", "es": "¿Qué tipo de autenticación está disponible en esta estación de carga?", - "fr": "Quelle sorte d'authentification est disponible à cette station de charge ?", - "ca": "Quin tipus d'autenticació hi ha disponible a l'estació de càrrega?" + "fr": "Quelle sorte d'authentification est disponible à cette station de charge ?" }, "multiAnswer": true, "mappings": [ @@ -3979,11 +3979,11 @@ "then": { "en": "Authentication by a membership card", "nl": "Aanmelden met een lidkaart is mogelijk", + "ca": "Autenticació mitjançant una targeta de soci", "da": "Godkendelse med et medlemskort", "de": "Authentifizierung per Mitgliedskarte", "es": "Autenticación mediante tarjeta de membresía", - "fr": "Authentification par carte de membre", - "ca": "Autenticació mitjançant una targeta de soci" + "fr": "Authentification par carte de membre" } }, { @@ -3992,11 +3992,11 @@ "then": { "en": "Authentication by an app", "nl": "Aanmelden via een applicatie is mogelijk", + "ca": "Autenticació mitjançant una aplicació", "da": "Godkendelse med en app", "de": "Authentifizierung per App", "es": "Autenticación mediante aplicación", - "fr": "Authentification par une app", - "ca": "Autenticació mitjançant una aplicació" + "fr": "Authentification par une app" } }, { @@ -4005,11 +4005,11 @@ "then": { "en": "Authentication via phone call is available", "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk", + "ca": "L'autenticació per trucada telefònica està disponible", "da": "Godkendelse via telefonopkald er tilgængelig", "de": "Authentifizierung per Anruf ist möglich", "es": "Autenticación mediante llamada telefónica disponible", - "fr": "Authentification par appel téléphonique est disponible", - "ca": "L'autenticació per trucada telefònica està disponible" + "fr": "Authentification par appel téléphonique est disponible" } }, { @@ -4018,11 +4018,11 @@ "then": { "en": "Authentication via SMS is available", "nl": "Aanmelden via SMS is mogelijk", + "ca": "L'autenticació per SMS està disponible", "da": "Godkendelse via SMS er tilgængelig", "de": "Authentifizierung per SMS ist möglich", "es": "Autenticación mediante SMS disponible", - "fr": "Authentification par SMS est disponible", - "ca": "L'autenticació per SMS està disponible" + "fr": "Authentification par SMS est disponible" } }, { @@ -4031,11 +4031,11 @@ "then": { "en": "Authentication via NFC is available", "nl": "Aanmelden via NFC is mogelijk", + "ca": "L'autenticació via NFC està disponible", "da": "Godkendelse via NFC er tilgængelig", "de": "Authentifizierung per NFC ist möglich", "es": "Autenticación mediante NFC disponible", - "fr": "Authentification par NFC est disponible", - "ca": "L'autenticació via NFC està disponible" + "fr": "Authentification par NFC est disponible" } }, { @@ -4067,11 +4067,11 @@ "then": { "en": "Charging here is (also) possible without authentication", "nl": "Hier opladen is (ook) mogelijk zonder aan te melden", + "ca": "Carregar aquí (també) és possible sense autenticació", "da": "Opladning her er (også) muligt uden godkendelse", "de": "Das Laden ist hier (auch) ohne Authentifizierung möglich", "es": "La carga aquí (también) es posible sin autenticación", - "fr": "Charger ici est (aussi) possible sans authentification", - "ca": "Carregar aquí (també) és possible sense autenticació" + "fr": "Charger ici est (aussi) possible sans authentification" } } ], @@ -4087,17 +4087,17 @@ "render": { "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}", "nl": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}", + "ca": "Autentiqueu-vos trucant o enviant SMS a {authentication:phone_call:number}", "da": "Godkend dig ved at ringe eller sende en sms til {authentication:phone_call:number}", - "de": "Authentifizierung durch Anruf oder SMS an {authentication:phone_call:number}", - "ca": "Autentiqueu-vos trucant o enviant SMS a {authentication:phone_call:number}" + "de": "Authentifizierung durch Anruf oder SMS an {authentication:phone_call:number}" }, "question": { "en": "What's the phone number for authentication call or SMS?", "nl": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?", + "ca": "Quin és el número de telèfon per a la trucada d'autenticació o SMS?", "da": "Hvad er telefonnummeret til godkendelsesopkald eller SMS?", "de": "Wie lautet die Telefonnummer für den Authentifizierungsanruf oder die SMS?", - "es": "¿Cual es el número de teléfono para la llamada de autenticación o SMS?", - "ca": "Quin és el número de telèfon per a la trucada d'autenticació o SMS?" + "es": "¿Cual es el número de teléfono para la llamada de autenticación o SMS?" }, "freeform": { "key": "authentication:phone_call:number", @@ -4126,10 +4126,10 @@ "render": { "en": "One can stay at most {canonical(maxstay)}", "nl": "De maximale parkeertijd hier is {canonical(maxstay)}", + "ca": "Un pot quedar-se com a màxim {canonical(maxstay)}", "da": "Man kan højst blive {canonical(maxstay)}", "de": "Die maximale Parkdauer beträgt {canonical(maxstay)}", - "es": "Se puede estar como máximo {canonical(maxstay)}", - "ca": "Un pot quedar-se com a màxim {canonical(maxstay)}" + "es": "Se puede estar como máximo {canonical(maxstay)}" }, "mappings": [ { @@ -4331,8 +4331,8 @@ "question": { "en": "What is the website where one can find more information about this charging station?", "nl": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?", - "de": "Auf welcher Webseite kann man weitere Informationen über diese Ladestation finden?", - "ca": "Quina és la pàgina web on es pot trobar més informació sobre aquest punt de recàrrega?" + "ca": "Quina és la pàgina web on es pot trobar més informació sobre aquest punt de recàrrega?", + "de": "Auf welcher Webseite kann man weitere Informationen über diese Ladestation finden?" }, "render": { "en": "More info on {website}", @@ -4370,10 +4370,10 @@ "question": { "en": "Is this charging point in use?", "nl": "Is dit oplaadpunt operationeel?", + "ca": "Està en ús aquest punt de recàrrega?", "da": "Er denne ladestander i brug?", "de": "Ist die Station in Betrieb?", - "es": "¿Está en uso este punto de carga?", - "ca": "Està en ús aquest punt de recàrrega?" + "es": "¿Está en uso este punto de carga?" }, "mappings": [ { @@ -4446,10 +4446,10 @@ "then": { "en": "A charging station is constructed here", "nl": "Hier wordt op dit moment een oplaadpunt gebouwd", + "ca": "Aquí està construint-se una estació de càrrega", "da": "Her er opført en ladestation", "de": "Die Station ist aktuell im Bau", - "es": "Aquí está construida una estación de carga", - "ca": "Aquí està construint-se una estació de càrrega" + "es": "Aquí está construida una estación de carga" } }, { @@ -4465,10 +4465,10 @@ "then": { "en": "This charging station has beed permanently disabled and is not in use anymore but is still visible", "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig", + "ca": "Aquesta estació de recàrrega s'ha desactivat permanentment i ja no s'utilitza, però encara és visible", "da": "Denne ladestation er blevet permanent deaktiveret og er ikke længere i brug, men er stadig synlig", "de": "Die Station ist dauerhaft geschlossen und nicht mehr in Nutzung, aber noch sichtbar", - "es": "Esta estación de carga se ha deshabilitado de forma permanente y ya no está en uso pero todavía es visible", - "ca": "Aquesta estació de recàrrega s'ha desactivat permanentment i ja no s'utilitza, però encara és visible" + "es": "Esta estación de carga se ha deshabilitado de forma permanente y ya no está en uso pero todavía es visible" } } ] @@ -4607,10 +4607,10 @@ "title": { "en": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)", "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact (speciaal bedoeld voor fietsen)", + "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal (destinat a carregar bicicletes elèctriques)", "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik (beregnet til opladning af elektriske cykler)", "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)", - "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal (pensado para cargar bicicletas eléctricas)", - "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal (destinat a carregar bicicletes elèctriques)" + "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal (pensado para cargar bicicletas eléctricas)" }, "preciseInput": { "preferredBackground": "map" @@ -4625,10 +4625,10 @@ "title": { "en": "a charging station for cars", "nl": "een oplaadstation voor elektrische auto's", + "ca": "una estació de càrrega per a cotxes", "da": "en ladestation til biler", "de": "Eine Ladestation für Elektrofahrzeuge", - "es": "una estación de carga para coches", - "ca": "una estació de càrrega per a cotxes" + "es": "una estación de carga para coches" }, "preciseInput": { "preferredBackground": "map" @@ -4752,10 +4752,10 @@ "question": { "en": "Has a
Type 1 with cable (J1772)
connector", "nl": "Heeft een
Type 1 met kabel (J1772)
", + "ca": "Té un connector de
Tipus 1 amb cable (J1772)
", "da": "Har et
Type 1 med kabel (J1772)
stik", "de": "Verfügt über einen
Typ 1 (J1772)
Stecker mit Kabel", - "es": "Tiene un conector de
Tipo 1 con cable (J1772)
", - "ca": "Té un connector de
Tipus 1 amb cable (J1772)
" + "es": "Tiene un conector de
Tipo 1 con cable (J1772)
" }, "osmTags": "socket:type1_cable~*" }, @@ -4786,10 +4786,10 @@ "question": { "en": "Has a
Tesla Supercharger
connector", "nl": "Heeft een
Tesla Supercharger
", + "ca": "Té un connector
Tesla Supercharger
", "da": "Har et
Tesla Supercharger
stik", "de": "Verfügt über einen
Tesla Supercharger
Stecker", - "es": "Tiene un conector
Tesla Supercharger
", - "ca": "Té un connector
Tesla Supercharger
" + "es": "Tiene un conector
Tesla Supercharger
" }, "osmTags": "socket:tesla_supercharger~*" }, @@ -4797,10 +4797,10 @@ "question": { "en": "Has a
Type 2 (mennekes)
connector", "nl": "Heeft een
Type 2 (mennekes)
", + "ca": "Té un connector
Tipus 2 (mennekes)
", "da": "Har en
Type 2 (mennekes)
connector", "de": "Hat einen
Typ 2 (Mennekes)
Anschluss", - "es": "Tiene un conector
Tipo 2 (mennekes)
", - "ca": "Té un connector
Tipus 2 (mennekes)
" + "es": "Tiene un conector
Tipo 2 (mennekes)
" }, "osmTags": "socket:type2~*" }, diff --git a/assets/layers/fixme/fixme.json b/assets/layers/fixme/fixme.json index e15cae27a..63255ff53 100644 --- a/assets/layers/fixme/fixme.json +++ b/assets/layers/fixme/fixme.json @@ -13,7 +13,8 @@ "osmTags": { "or": [ "fixme~*", - "FIXME~*"] + "FIXME~*" + ] } }, "title": { diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 9ef55019b..98962045a 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,22 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "ca": "Canvis fets amb MapComplete", - "cs": "Změny provedené pomocí MapComplete", - "de": "Änderungen mit MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "ca": "Mostra els canvis fets per MapComplete", - "cs": "Zobrazuje změny provedené nástrojem MapComplete", - "de": "Zeigt Änderungen, die mit MapComplete vorgenommen wurden" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "ca": "Aquest mapa mostra tots els canvis fets amb MapComplete", - "cs": "Tyto mapy zobrazují všechny změny provedené pomocí MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -29,10 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "ca": "Centre del conjunt de canvis", - "cs": "Centra změn", - "de": "Zentrum der Änderungssätze" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -43,62 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "ca": "Conjunt de canvis per a {theme}", - "cs": "Sada změn pro {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "ca": "Mostra tots els canvis de MapComplete", - "cs": "Zobrazí všechny změny MapComplete", - "de": "Zeigt alle MapComplete-Änderungen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "ca": "Conjunt de canvi {id}", - "cs": "Sada změn je {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "ca": "Quin col·laborador va fer aquest canvi?", - "cs": "Který přispěvatel tuto změnu provedl?", - "de": "Wer hat diese Änderung vorgenommen?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "ca": "Canvi fet per {user}", - "cs": "Změna provedená {user}", - "de": "Änderung vorgenommen von {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "ca": "Quin tema es va utilitzar per fer aquest canvi?", - "cs": "Jaké téma bylo použito k provedení této změny?", - "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}", - "ca": "Canvi amb el tema {theme}", - "cs": "Změna pomocí tématu {theme}", - "de": "Geändert mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -107,31 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "ca": "Amb quina configuració regional (idioma) s'ha fet aquest canvi?", - "cs": "V jakém prostředí (jazyce) byla tato změna provedena?", - "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "ca": "La configuració regional de l'usuari és {locale}", - "cs": "Uživatelské prostředí je {locale}", - "de": "Benutzergebietsschema ist {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}", - "ca": "Canvi amb {host}", - "cs": "Změna u {host}", - "de": "Geändert über {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "ca": "Amb quin amfitrió (lloc web) es va fer aquest canvi?", - "cs": "U jakého hostitele (webové stránky) byla tato změna provedena?", - "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -480,10 +435,7 @@ } ], "question": { - "en": "Themename contains {search}", - "ca": "El nom del tema conté {search}", - "cs": "Themename obsahuje {search}", - "de": "Themename enthält {search}" + "en": "Themename contains {search}" } } ] @@ -499,10 +451,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "ca": "Fet pel col·laborador {search}", - "cs": "Vytvořil přispěvatel {search}", - "de": "Erstellt von {search}" + "en": "Made by contributor {search}" } } ] @@ -518,10 +467,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "ca": "No fet pel col·laborador {search}", - "cs": "Ne vytvořeno přispěvatelem {search}", - "de": "Nicht erstellt von {search}" + "en": "Not made by contributor {search}" } } ] @@ -538,10 +484,7 @@ } ], "question": { - "en": "Made before {search}", - "ca": "Fet abans de {search}", - "cs": "Vytvořeno před {search}", - "de": "Erstellt vor {search}" + "en": "Made before {search}" } } ] @@ -558,10 +501,7 @@ } ], "question": { - "en": "Made after {search}", - "ca": "Fet després de {search}", - "cs": "Vytvořeno po {search}", - "de": "Erstellt nach {search}" + "en": "Made after {search}" } } ] @@ -577,10 +517,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "ca": "Idioma de l'usuari (codi iso) {search}", - "cs": "Jazyk uživatele (iso-kód) {search}", - "de": "Benutzersprache (ISO-Code) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -596,10 +533,7 @@ } ], "question": { - "en": "Made with host {search}", - "ca": "Fet amb l'amfitrió {search}", - "cs": "Vyrobeno u hostitele {search}", - "de": "Erstellt mit host {search}" + "en": "Made with host {search}" } } ] @@ -610,10 +544,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "ca": "El conjunt de canvis ha afegit almenys una imatge", - "cs": "Sada změn přidala alespoň jeden obrázek", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt" + "en": "Changeset added at least one image" } } ] @@ -628,10 +559,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "ca": "Es poden trobar més estadístiques aquí", - "cs": "Další statistiky lze nalézt zde", - "de": "Weitere Statistiken hier" + "en": "More statistics can be found here" } }, { diff --git a/assets/translators.json b/assets/translators.json index 63d0b4e8e..2bf4d568e 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,15 +1,15 @@ { "contributors": [ { - "commits": 266, + "commits": 271, "contributor": "kjon" }, { - "commits": 256, + "commits": 264, "contributor": "Pieter Vander Vennet" }, { - "commits": 120, + "commits": 137, "contributor": "paunofu" }, { @@ -17,7 +17,7 @@ "contributor": "Allan Nordhøy" }, { - "commits": 67, + "commits": 68, "contributor": "Robin van der Linde" }, { @@ -41,9 +41,13 @@ "contributor": "Artem" }, { - "commits": 27, + "commits": 28, "contributor": "Supaplex" }, + { + "commits": 25, + "contributor": "Jiří Podhorecký" + }, { "commits": 25, "contributor": "Reza Almanda" @@ -56,6 +60,10 @@ "commits": 21, "contributor": "SC" }, + { + "commits": 18, + "contributor": "Lucas" + }, { "commits": 18, "contributor": "el_libre como el chaval" @@ -76,10 +84,6 @@ "commits": 14, "contributor": "J. Lavoie" }, - { - "commits": 13, - "contributor": "Lucas" - }, { "commits": 13, "contributor": "Olivier" @@ -94,7 +98,7 @@ }, { "commits": 11, - "contributor": "Jiří Podhorecký" + "contributor": "Túllio Franca" }, { "commits": 10, @@ -148,6 +152,14 @@ "commits": 7, "contributor": "Niels Elgaard Larsen" }, + { + "commits": 6, + "contributor": "Felipe Nogueira" + }, + { + "commits": 6, + "contributor": "David Haberthür" + }, { "commits": 6, "contributor": "Ettore Atalan" @@ -184,6 +196,10 @@ "commits": 6, "contributor": "lvgx" }, + { + "commits": 5, + "contributor": "gallegonovato" + }, { "commits": 5, "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ ZOUHIR DEHBI" @@ -208,10 +224,6 @@ "commits": 5, "contributor": "phlostically" }, - { - "commits": 5, - "contributor": "David Haberthür" - }, { "commits": 5, "contributor": "Piotr" @@ -220,10 +232,6 @@ "commits": 5, "contributor": "Alexey Shabanov" }, - { - "commits": 4, - "contributor": "gallegonovato" - }, { "commits": 4, "contributor": "André Marcelo Alvarenga" @@ -316,10 +324,6 @@ "commits": 2, "contributor": "HO Gin Wang" }, - { - "commits": 2, - "contributor": "Felipe Nogueira" - }, { "commits": 2, "contributor": "multiflexi" diff --git a/langs/layers/de.json b/langs/layers/de.json index ec41b727b..a7487dc52 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -8084,6 +8084,11 @@ "freeform": { "placeholder": "Name des Betreibers" }, + "mappings": { + "0": { + "then": "Niederländische Eisenbahn (NS)" + } + }, "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" } diff --git a/langs/layers/en.json b/langs/layers/en.json index 7e2f1671b..c853eaedf 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4111,6 +4111,15 @@ }, "question": "Does this elevator work?" }, + "speech_output": { + "render": { + "special": { + "question": "In which languages does this elevator have speech output?", + "render_list_item": "This elevator has speech output in {language():font-bold}", + "render_single_language": "This elevator has speech output in {language():font-bold}" + } + } + }, "tactile_writing_language": { "render": { "special": { @@ -4594,6 +4603,21 @@ "render": "Fitness Station" } }, + "fixme": { + "description": "OSM objects that likely need to be fixed, based on a FIXME tag.", + "name": "OSM objects with FIXME tags", + "tagRenderings": { + "fixme": { + "render": "Fixme Text: {fixme}" + }, + "note": { + "render": "Note Text: {note}" + } + }, + "title": { + "render": "OSM object with FIXME tag" + } + }, "food": { "deletion": { "extraDeleteReasons": { @@ -8105,6 +8129,11 @@ "freeform": { "placeholder": "Name of the operator" }, + "mappings": { + "0": { + "then": "Dutch Railways (NS)" + } + }, "question": "Who is the operator of this ticket validator?", "render": "This ticket validator is operated by {operator}" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index ccad63a2c..3f253aabb 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3995,6 +3995,15 @@ }, "question": "Werkt deze lift?" }, + "speech_output": { + "render": { + "special": { + "question": "In welke talen heeft deze lift gesproken tekst?", + "render_list_item": "Deze lift heeft gesproken tekst in het {language():font-bold}", + "render_single_language": "Deze lift heeft gesproken tekst in het {language():font-bold}" + } + } + }, "tactile_writing_language": { "render": { "special": { @@ -7759,6 +7768,11 @@ "validator-operator": { "freeform": { "placeholder": "Naam van de beheerder" + }, + "mappings": { + "0": { + "then": "Nederlandse Spoorwegen (NS)" + } } } } diff --git a/scripts/downloadFromOverpass.ts b/scripts/downloadFromOverpass.ts index acaedab57..4ab70b4c6 100644 --- a/scripts/downloadFromOverpass.ts +++ b/scripts/downloadFromOverpass.ts @@ -1,24 +1,29 @@ -import Script from "./Script"; -import {TagUtils} from "../Logic/Tags/TagUtils"; -import {And} from "../Logic/Tags/And"; -import Constants from "../Models/Constants"; -import {ImmutableStore} from "../Logic/UIEventSource"; -import {BBox} from "../Logic/BBox"; -import {Overpass} from "../Logic/Osm/Overpass"; +import Script from "./Script" +import { TagUtils } from "../Logic/Tags/TagUtils" +import { And } from "../Logic/Tags/And" +import Constants from "../Models/Constants" +import { ImmutableStore } from "../Logic/UIEventSource" +import { BBox } from "../Logic/BBox" +import { Overpass } from "../Logic/Osm/Overpass" const fs = require("fs") class DownloadFromOverpass extends Script { - constructor() { - super("Downloads data from openstreetmap, will save this as 'export.geojson'. All arguments will be interpreted as key=value pairs"); + super( + "Downloads data from openstreetmap, will save this as 'export.geojson'. All arguments will be interpreted as key=value pairs" + ) } async main(args: string[]): Promise { - const tags = new And(args.map(k => TagUtils.Tag(k))) - const overpass = new Overpass(tags,[], Constants.defaultOverpassUrls[0], new ImmutableStore(500)) + const tags = new And(args.map((k) => TagUtils.Tag(k))) + const overpass = new Overpass( + tags, + [], + Constants.defaultOverpassUrls[0], + new ImmutableStore(500) + ) const [data, _] = await overpass.queryGeoJson(BBox.global) fs.writeFileSync("export.geojson", JSON.stringify(data), "utf8") - console.log("Written", data.features.length,"entries") + console.log("Written", data.features.length, "entries") } - } new DownloadFromOverpass().run() diff --git a/scripts/generateImageAnalysis.ts b/scripts/generateImageAnalysis.ts index 4133380a1..7a002f441 100644 --- a/scripts/generateImageAnalysis.ts +++ b/scripts/generateImageAnalysis.ts @@ -110,10 +110,13 @@ export default class GenerateImageAnalysis extends Script { const msg = `${i}/${ allImages.size - } downloaded: ${d},skipped: ${s}, failed: ${f}, running: ${Math.floor(runningSecs)}sec, ETA: ${estimatedActualMinutes}:${ - estimatedActualSeconds % 60 - }` - ScriptUtils.erasableLog( " ", msg) + } downloaded: ${d},skipped: ${s}, failed: ${f}, running: ${Math.floor( + runningSecs + )}sec, ETA: ${estimatedActualMinutes}:${estimatedActualSeconds % 60}` + ScriptUtils.erasableLog( + " ", + msg + ) if (downloaded) { d++ } else {