diff --git a/src/html/command_line.html b/src/html/command_line.html index 8545a2c7e..ca546fed1 100644 --- a/src/html/command_line.html +++ b/src/html/command_line.html @@ -51,7 +51,7 @@

HTTP methods and headers

400 Bad Request is sent if the request has a syntax error. In this case the payload contains a HTML document describing what is wrong with the request. Please note that although the HTTP standard requires such a payload, some HTTP clients, notably wget ignore the payload. Please try then curl or your favourite browser.

-

429 Too Many Requests is sent if you pass multiple queries from one IP. This is a fair use policy to avoid that a single user uses up all server resources. If you want to terminate the runaway query that prevents you from sending other queries, you can surf to /api/kill_my_queries.

+

429 Too Many Requests is sent if you pass multiple queries from one IP. This is a fair use policy to avoid that a single user uses up all server resources. If you want to terminate the runaway query that prevents you from sending other queries, you can surf to /api/kill_my_queries.

504 Gateway Timeout is sent if the server has already so much load that the request cannot be executed. In most cases, it is best to try again later. Please note that the server decides this based on the timeout and maxsize parameters of the request, so smaller values for them may also make the request acceptable.

diff --git a/src/html/output_formats.html b/src/html/output_formats.html index 80b0382ef..4d1bae8b5 100644 --- a/src/html/output_formats.html +++ b/src/html/output_formats.html @@ -26,7 +26,7 @@

OSM XML

The format generally follows the description in the wiki. It doesn't contain a bounds tag, and it may contain certain additional tags. Anyway, in all cases well-formed XML is returned.

-

A response (an example) from Overpass API has always the following header and footer:

+

A response (an example) from Overpass API has always the following header and footer:

 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="Overpass API">
@@ -70,10 +70,10 @@ 
OSM JSON

 
 
To get a response in format JSON, start the request with a [out:json] directive, for example:

 
-/api/interpreter?data=[out:json];out;
+/api/interpreter?data=[out:json];out;
 

 
-
A response (an example) from Overpass API always has the following header and footer:

+
A response (an example) from Overpass API always has the following header and footer:

 
 {
   "version": 0.6,
@@ -89,7 +89,14 @@ 
OSM JSON

   ]
 }
 

-
The payload is contained between the brackets after elements. Each element is contained in a pair of curly braces, and two elements are separate by a comma. The date is constructed in the same way as for the XML format.

+
The payload is contained between the brackets after elements. Each element is contained in a pair of curly braces, and two elements are separate by a comma.

+
+
As with XML, if a query involves areas a second timestamp is included, here as another property of the osm3s object with key timestamp_areas_base:

+
+"timestamp_areas_base": "date",
+

+
+
The date value of both timestamp properties are constructed in the same way as for the XML format.

 
 
We discuss the node representation (and further down the representations of
 ways and relations) by examples:

@@ -194,19 +201,19 @@ 
Custom output and Redirects

 
 
The simplest variant is the redirect with potential disambiguation page. We give two examples:

 
 
In the first example, no disambiguation is necessary because the search criteria describe an unique object. In the second example, three objects exist and do so for good reason. Thus, a disambiguation page is necessary and therefore displayed.

 
 
If you want always a disambiguation page, you can add the directive redirect=no to the end. This forces a disambiguation page to be displayed:

 
 
 
You can of course also change the destination URL. Add url=something to the end. For example, we replace the element view on the main database by a full map view in the above query:

 
 
Note that the URL usually depends on the id and the type of the found results. To customize this, you can add the placeholders {{{type}}} and {{{id}}} anywhere in the URL; these will be replaced by the proper type (node, way or relation) and the id of the found object.

 
@@ -217,8 +224,8 @@ 
Custom output and Redirects

 
 
By default, default.wiki is used as template. To select another template, for example the just introduced base.wiki, use the template=something directive. Please compare:

 
 
Technically, the template is taken from the subdirectory templates of the database directory of the server. For the public instances, there exist also a mechanism to upload a completetly custom template from the wiki to this directory. The upload mechanism is explained on the Wiki employment page. The syntax of the template page is explained in the following: