Regenerate documentation

This commit is contained in:
Pieter Vander Vennet 2023-01-29 13:48:32 +01:00
parent febc4da6ec
commit 99ff878afe
82 changed files with 211 additions and 151 deletions

View file

@ -112,6 +112,7 @@
- extinguisher - extinguisher
- fire_station - fire_station
- fitness_centre - fitness_centre
- fitness_station
- food - food
- ghost_bike - ghost_bike
- governments - governments

View file

@ -23,6 +23,7 @@
+ [sidewalk:left, sidewalk:right, generic_key:left:property, generic_key:right:property](#sidewalkleft,-sidewalk:right,-generic_key:left:property,-generic_key:right:property) + [sidewalk:left, sidewalk:right, generic_key:left:property, generic_key:right:property](#sidewalkleft,-sidewalk:right,-generic_key:left:property,-generic_key:right:property)
+ [_geometry:type](#_geometrytype) + [_geometry:type](#_geometrytype)
+ [_level](#_level) + [_level](#_level)
+ [_referencing_ways](#_referencing_ways)
+ [distanceTo](#distanceto) + [distanceTo](#distanceto)
+ [overlapWith](#overlapwith) + [overlapWith](#overlapwith)
+ [enclosingFeatures](#enclosingfeatures) + [enclosingFeatures](#enclosingfeatures)
@ -191,6 +192,16 @@ Extract the 'level'-tag into a normalized, ';'-separated value
### _referencing_ways
_referencing_ways contains - for a node - which ways use this this node as point in their geometry.
This is a lazy metatag and is only calculated when needed
Calculating tags with Javascript Calculating tags with Javascript
---------------------------------- ----------------------------------

View file

@ -100,6 +100,8 @@ The question is *Can a bicycle go past this barrier?*
- *A cyclist can not go past this.* corresponds with `bicycle=no` - *A cyclist can not go past this.* corresponds with `bicycle=no`
This tagrendering is only visible in the popup if the following condition is met: `_referencing_ways~.+`
### barrier_type ### barrier_type
@ -171,6 +173,8 @@ This is rendered with `Maximum width: {maxwidth:physical} m`
This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier!=double&cycle_barrier!=triple&_referencing_ways~.+`
### Space between barrier (cyclebarrier) ### Space between barrier (cyclebarrier)

View file

@ -68,6 +68,18 @@ attribute | type | values which are supported by this layer
### images
This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
This tagrendering has no question and is thus read-only
### name ### name

View file

@ -15,7 +15,7 @@ A layer showing the OpenStreetMap Communities
- This layer is shown at zoomlevel **0** and higher - This layer is shown at zoomlevel **0** and higher
- <img src='../warning.svg' height='1rem'/> This layer is loaded from an external source, namely `https://raw.githubusercontent.com/osmlab/osm-community-index/main/dist/completeFeatureCollection.json` - <img src='../warning.svg' height='1rem'/> This layer is loaded from an external source, namely `https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson`

View file

@ -591,12 +591,12 @@
}, },
{ {
"key": "bicycle", "key": "bicycle",
"description": "Layer 'Barriers' shows bicycle=yes with a fixed text, namely 'A cyclist can go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')", "description": "Layer 'Barriers' shows bicycle=yes with a fixed text, namely 'A cyclist can go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if _referencing_ways~.+)",
"value": "yes" "value": "yes"
}, },
{ {
"key": "bicycle", "key": "bicycle",
"description": "Layer 'Barriers' shows bicycle=no with a fixed text, namely 'A cyclist can not go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')", "description": "Layer 'Barriers' shows bicycle=no with a fixed text, namely 'A cyclist can not go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if _referencing_ways~.+)",
"value": "no" "value": "no"
}, },
{ {
@ -656,7 +656,7 @@
}, },
{ {
"key": "maxwidth:physical", "key": "maxwidth:physical",
"description": "Layer 'Barriers' shows and asks freeform values for key 'maxwidth:physical' (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if cycle_barrier!=double&cycle_barrier!=triple)" "description": "Layer 'Barriers' shows and asks freeform values for key 'maxwidth:physical' (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if cycle_barrier!=double&cycle_barrier!=triple&_referencing_ways~.+)"
}, },
{ {
"key": "width:separation", "key": "width:separation",

View file

@ -6003,6 +6003,22 @@
"description": "The MapComplete theme Personal theme has a layer Fitness Stations showing features with this tag", "description": "The MapComplete theme Personal theme has a layer Fitness Stations showing features with this tag",
"value": "fitness_station" "value": "fitness_station"
}, },
{
"key": "image",
"description": "The layer 'Fitness Stations 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 'Fitness Stations 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 'Fitness Stations 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 'Fitness Stations 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": "name", "key": "name",
"description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')" "description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"

View file

@ -273,6 +273,22 @@
"description": "The MapComplete theme Sports has a layer Fitness Stations showing features with this tag", "description": "The MapComplete theme Sports has a layer Fitness Stations showing features with this tag",
"value": "fitness_station" "value": "fitness_station"
}, },
{
"key": "image",
"description": "The layer 'Fitness Stations 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 'Fitness Stations 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 'Fitness Stations 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 'Fitness Stations 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": "name", "key": "name",
"description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Sports')" "description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Sports')"

View file

@ -1,7 +1,7 @@
Open AED Map ( [aed](https://mapcomplete.osm.be/aed) ) Open AED Map ( [aed](https://mapcomplete.osm.be/aed) )
--------------------- --------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Artwork Map ( artwork) Open Artwork Map ( [artwork](https://mapcomplete.osm.be/artwork) )
----------------------------- --------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
ATM Machines ( atm) ATM Machines ( [atm](https://mapcomplete.osm.be/atm) )
--------------------- --------------------------------------------------------

View file

@ -1,7 +1,7 @@
BAG import helper ( bag) BAG import helper ( [bag](https://mapcomplete.osm.be/bag) )
-------------------------- -------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Benches ( benches) Benches ( [benches](https://mapcomplete.osm.be/benches) )
-------------------- -----------------------------------------------------------

View file

@ -1,7 +1,7 @@
Bicycle rental ( bicycle_rental) Bicycle rental ( [bicycle_rental](https://mapcomplete.osm.be/bicycle_rental) )
---------------------------------- --------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Bicycle libraries ( bicyclelib) Bicycle libraries ( [bicyclelib](https://mapcomplete.osm.be/bicyclelib) )
--------------------------------- ---------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Binoculars ( binoculars) Binoculars ( [binoculars](https://mapcomplete.osm.be/binoculars) )
-------------------------- --------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
OSM for the blind ( blind_osm) OSM for the blind ( [blind_osm](https://mapcomplete.osm.be/blind_osm) )
-------------------------------- -------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Bookcase Map ( bookcases) Open Bookcase Map ( [bookcases](https://mapcomplete.osm.be/bookcases) )
-------------------------------- -------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Breng jouw buurtnatuur in kaart ( buurtnatuur) Breng jouw buurtnatuur in kaart ( [buurtnatuur](https://mapcomplete.osm.be/buurtnatuur) )
------------------------------------------------ -------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Cafés and pubs ( cafes_and_pubs) Cafés and pubs ( [cafes_and_pubs](https://mapcomplete.osm.be/cafes_and_pubs) )
---------------------------------- --------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Campersites ( campersite) Campersites ( [campersite](https://mapcomplete.osm.be/campersite) )
--------------------------- ---------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Charging stations ( charging_stations) Charging stations ( [charging_stations](https://mapcomplete.osm.be/charging_stations) )
---------------------------------------- -----------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Climbing Map ( climbing) Open Climbing Map ( [climbing](https://mapcomplete.osm.be/climbing) )
------------------------------- -----------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Cycle highways ( cycle_highways) Cycle highways ( [cycle_highways](https://mapcomplete.osm.be/cycle_highways) )
---------------------------------- --------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Bicycle infrastructure ( cycle_infra) Bicycle infrastructure ( [cycle_infra](https://mapcomplete.osm.be/cycle_infra) )
--------------------------------------- ----------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Cycle Node Networks ( cyclenodes) Cycle Node Networks ( [cyclenodes](https://mapcomplete.osm.be/cyclenodes) )
----------------------------------- -----------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Cyclestreets ( cyclestreets) Cyclestreets ( [cyclestreets](https://mapcomplete.osm.be/cyclestreets) )
------------------------------ --------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Cyclofix - an open map for cyclists ( cyclofix) Cyclofix - an open map for cyclists ( [cyclofix](https://mapcomplete.osm.be/cyclofix) )
------------------------------------------------- -----------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Drinking Water ( drinking_water) Drinking Water ( [drinking_water](https://mapcomplete.osm.be/drinking_water) )
---------------------------------- --------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Education ( education) Education ( [education](https://mapcomplete.osm.be/education) )
------------------------ -----------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Etymology Map ( etymology) Open Etymology Map ( [etymology](https://mapcomplete.osm.be/etymology) )
--------------------------------- --------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Facade gardens ( facadegardens) Facade gardens ( [facadegardens](https://mapcomplete.osm.be/facadegardens) )
--------------------------------- ------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Restaurants and fast food ( food) Restaurants and fast food ( [food](https://mapcomplete.osm.be/food) )
----------------------------------- -----------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Fries shops ( fritures) Fries shops ( [fritures](https://mapcomplete.osm.be/fritures) )
------------------------- -----------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Boomgaardenkaart ( fruit_trees) Open Boomgaardenkaart ( [fruit_trees](https://mapcomplete.osm.be/fruit_trees) )
-------------------------------------- ---------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Ghost bikes ( ghostbikes) Ghost bikes ( [ghostbikes](https://mapcomplete.osm.be/ghostbikes) )
--------------------------- ---------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
GRB import helper ( grb) GRB import helper ( [grb](https://mapcomplete.osm.be/grb) )
-------------------------- -------------------------------------------------------------

View file

@ -1,7 +1,7 @@
GRB Fixup ( grb_fixme) GRB Fixup ( [grb_fixme](https://mapcomplete.osm.be/grb_fixme) )
------------------------ -----------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Hackerspaces ( hackerspaces) Hackerspaces ( [hackerspaces](https://mapcomplete.osm.be/hackerspaces) )
------------------------------ --------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Hydrants, Extinguishers, Fire stations, and Ambulance stations ( hailhydrant) Hydrants, Extinguishers, Fire stations, and Ambulance stations ( [hailhydrant](https://mapcomplete.osm.be/hailhydrant) )
------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Healthcare ( healthcare) Healthcare ( [healthcare](https://mapcomplete.osm.be/healthcare) )
-------------------------- --------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Hotels ( hotels) Hotels ( [hotels](https://mapcomplete.osm.be/hotels) )
------------------ --------------------------------------------------------

View file

@ -1,7 +1,7 @@
Indoors ( indoors) Indoors ( [indoors](https://mapcomplete.osm.be/indoors) )
-------------------- -----------------------------------------------------------

View file

@ -1,7 +1,7 @@
Kerbs and crossings ( kerbs_and_crossings) Kerbs and crossings ( [kerbs_and_crossings](https://mapcomplete.osm.be/kerbs_and_crossings) )
-------------------------------------------- -----------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Changes made with MapComplete ( mapcomplete-changes) Changes made with MapComplete ( [mapcomplete-changes](https://mapcomplete.osm.be/mapcomplete-changes) )
------------------------------------------------------ ---------------------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
MapRoulette Tasks ( maproulette) MapRoulette Tasks ( [maproulette](https://mapcomplete.osm.be/maproulette) )
---------------------------------- -----------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
A map of maps ( maps) A map of maps ( [maps](https://mapcomplete.osm.be/maps) )
----------------------- -----------------------------------------------------------

View file

@ -1,7 +1,7 @@
Maxspeed ( maxspeed) Maxspeed ( [maxspeed](https://mapcomplete.osm.be/maxspeed) )
---------------------- --------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Into nature ( nature) Into nature ( [nature](https://mapcomplete.osm.be/nature) )
----------------------- -------------------------------------------------------------

View file

@ -1,7 +1,7 @@
The map of Natuurpunt ( natuurpunt) The map of Natuurpunt ( [natuurpunt](https://mapcomplete.osm.be/natuurpunt) )
------------------------------------- -------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Notes on OpenStreetMap ( notes) Notes on OpenStreetMap ( [notes](https://mapcomplete.osm.be/notes) )
--------------------------------- ----------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Observation towers ( observation_towers) Observation towers ( [observation_towers](https://mapcomplete.osm.be/observation_towers) )
------------------------------------------ --------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
OnWheels ( onwheels) OnWheels ( [onwheels](https://mapcomplete.osm.be/onwheels) )
---------------------- --------------------------------------------------------------

View file

@ -1,7 +1,7 @@
OpenWindPowerMap ( openwindpowermap) OpenWindPowerMap ( [openwindpowermap](https://mapcomplete.osm.be/openwindpowermap) )
-------------------------------------- --------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
OSM Community Index ( osm_community_index) OSM Community Index ( [osm_community_index](https://mapcomplete.osm.be/osm_community_index) )
-------------------------------------------- -----------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Parking ( parkings) Parking ( [parkings](https://mapcomplete.osm.be/parkings) )
--------------------- -------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Personal theme ( personal) Personal theme ( [personal](https://mapcomplete.osm.be/personal) )
---------------------------- --------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Veterinarians, dog parks and other pet-amenities ( pets) Veterinarians, dog parks and other pet-amenities ( [pets](https://mapcomplete.osm.be/pets) )
---------------------------------------------------------- ----------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Speelbossen ( play_forests) Speelbossen ( [play_forests](https://mapcomplete.osm.be/play_forests) )
----------------------------- -------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Playgrounds ( playgrounds) Playgrounds ( [playgrounds](https://mapcomplete.osm.be/playgrounds) )
---------------------------- -----------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Postal codes ( postal_codes) Postal codes ( [postal_codes](https://mapcomplete.osm.be/postal_codes) )
------------------------------ --------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Postbox and Post Office Map ( postboxes) Postbox and Post Office Map ( [postboxes](https://mapcomplete.osm.be/postboxes) )
------------------------------------------ -----------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Rainbow pedestrian crossings ( rainbow_crossings) Rainbow pedestrian crossings ( [rainbow_crossings](https://mapcomplete.osm.be/rainbow_crossings) )
--------------------------------------------------- ----------------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Shop Map ( shops) Open Shop Map ( [shops](https://mapcomplete.osm.be/shops) )
------------------------ -------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Sidewalks ( sidewalks) Sidewalks ( [sidewalks](https://mapcomplete.osm.be/sidewalks) )
------------------------ -----------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Welkom bij de groendoener! ( speelplekken) Welkom bij de groendoener! ( [speelplekken](https://mapcomplete.osm.be/speelplekken) )
-------------------------------------------- ----------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Sport pitches ( sport_pitches) Sport pitches ( [sport_pitches](https://mapcomplete.osm.be/sport_pitches) )
-------------------------------- -----------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Sports ( sports) Sports ( [sports](https://mapcomplete.osm.be/sports) )
------------------ --------------------------------------------------------

View file

@ -1,7 +1,7 @@
Train Stations ( stations) Train Stations ( [stations](https://mapcomplete.osm.be/stations) )
---------------------------- --------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Street Lighting ( street_lighting) Street Lighting ( [street_lighting](https://mapcomplete.osm.be/street_lighting) )
------------------------------------ -----------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Straatverlichting - Assen ( street_lighting_assen) Straatverlichting - Assen ( [street_lighting_assen](https://mapcomplete.osm.be/street_lighting_assen) )
---------------------------------------------------- ---------------------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Surveillance under Surveillance ( surveillance) Surveillance under Surveillance ( [surveillance](https://mapcomplete.osm.be/surveillance) )
------------------------------------------------- ---------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Pin je punt ( toerisme_vlaanderen) Pin je punt ( [toerisme_vlaanderen](https://mapcomplete.osm.be/toerisme_vlaanderen) )
------------------------------------ ---------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Open Toilet Map ( toilets) Open Toilet Map ( [toilets](https://mapcomplete.osm.be/toilets) )
---------------------------- -------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Bus routes ( transit) Bus routes ( [transit](https://mapcomplete.osm.be/transit) )
----------------------- --------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Trees ( trees) Trees ( [trees](https://mapcomplete.osm.be/trees) )
---------------- -----------------------------------------------------

View file

@ -1,7 +1,7 @@
Addresses in Great Britain ( uk_addresses) Addresses in Great Britain ( [uk_addresses](https://mapcomplete.osm.be/uk_addresses) )
-------------------------------------------- ----------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Walls and buildings ( walls_and_buildings) Walls and buildings ( [walls_and_buildings](https://mapcomplete.osm.be/walls_and_buildings) )
-------------------------------------------- -----------------------------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Waste ( waste) Waste ( [waste](https://mapcomplete.osm.be/waste) )
---------------- -----------------------------------------------------

View file

@ -1,7 +1,7 @@
Afval - Assen ( waste_assen) Afval - Assen ( [waste_assen](https://mapcomplete.osm.be/waste_assen) )
------------------------------ -------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Waste Basket ( waste_basket) Waste Basket ( [waste_basket](https://mapcomplete.osm.be/waste_basket) )
------------------------------ --------------------------------------------------------------------------

View file

@ -1,7 +1,7 @@
Straatbreedtes ( width) Straatbreedtes ( [width](https://mapcomplete.osm.be/width) )
------------------------- --------------------------------------------------------------