Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
en:help:v2:maps:on-demand-create [2021/03/27 13:10] alpinequesten:help:v2:maps:on-demand-create [2023/09/15 20:07] (current) – external edit 127.0.0.1
Line 1: Line 1:
-<sub>[[en:help|Online Help]] > [[en:help:v2|AlpineQuest 2.x]] > [[en:help:v2:maps|Maps & Layers]]</sub>+<sub>[[en:help|Online Help]] > [[en:help:v2|AlpineQuest 2.x]] > [[en:help:v2:maps|Maps & Layers]] > How to create a custom map?</sub>
  
 ====== How to create a custom map? ====== ====== How to create a custom map? ======
 \\ \\
-The application uses an XML based format for its maps configuration. Files must have an ''"**.aqx**"'' extension and be placed in the ''"**[application folder]/datastore/custom-maps/**"'' folder (you may need to create the ''"**custom-maps**"'' sub-folder if it doesn't exist).+The application uses an XML based format for its custom on-demand maps configuration. Files must have an ''"**.aqx**"'' extension.
  
-See [[en:help:v2:settings:storage#how_to_locate_the_application_folder|how to locate the application folder here]].+To import an ''"**.aqx**"'' configuration file, you can simply select it from your device file manager, and choose the application when asked which application to use to open the file. The file will be imported and the maps it contains will be added to the on-demand maps list. 
 + 
 +Alternatively, you can manually put the configuration file in the ''"**[application folder]/datastore/maps/**"'' folder. See [[en:help:v2:settings:storage#how_to_locate_the_application_folder|how to locate the application folder here]].
  
 \\ \\
Line 15: Line 17:
 <file xml TEST1.AQX> <file xml TEST1.AQX>
 <?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
-<aqx version="9">+<aqx version="11">
  
   <name>Simple Test AQX</name>   <name>Simple Test AQX</name>
   <description>© OpenStreetMap</description>   <description>© OpenStreetMap</description>
  
-  <source id="MAP01">+  <source id="MAP_UID">
     <name>Standard Mapnik</name>     <name>Standard Mapnik</name>
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1-17">
       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>
     </zoom-levels>     </zoom-levels>
Line 35: Line 37:
 Note that the application will recognize the ''**{$x}**'', ''**{$y}**'' and ''**{$z}**'' variable and replace them with correct values. Note that the application will recognize the ''**{$x}**'', ''**{$y}**'' and ''**{$z}**'' variable and replace them with correct values.
  
-The source ''"**id**"'' field must be unique in the file, and contains only characters and numbers. It is used internally by the application to identify the data storage of the map.+If the map server uses the TMS standard (reversed y values compared to the Google/OSM standard), use ''**{$!y}**'' instead of ''**{$y}**''
 + 
 +The source ''"**id**"'' field must be unique in the file, and should only contain characters and numbers. It is used internally by the application to identify the data storage of the map.
  
 \\ \\
Line 45: Line 49:
 <file xml TEST2.AQX> <file xml TEST2.AQX>
 <?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
-<aqx version="9">+<aqx version="11">
  
   <name>Simple Test AQX</name>   <name>Simple Test AQX</name>
   <description>© OpenStreetMap</description>   <description>© OpenStreetMap</description>
  
-  <source id="MAP01" type="topo">+  <source id="MAP_UID" type="topo">
      
     <name>Standard Mapnik</name>     <name>Standard Mapnik</name>
Line 57: Line 61:
     <preview-location>5.90,44.80,12</preview-location>     <preview-location>5.90,44.80,12</preview-location>
  
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1,3,5,7,8,9,10,11,12,13,14,15,16,17" insecure="true">
          
       <update-delay>3M</update-delay>       <update-delay>3M</update-delay>
       <max-threads>2</max-threads>       <max-threads>2</max-threads>
-      <user-agent>MyApp</user-agent> 
       <key-url><![CDATA[https://www.openstreetmap.org/key]]></key-url>       <key-url><![CDATA[https://www.openstreetmap.org/key]]></key-url>
       <referer><![CDATA[https://www.openstreetmap.org/]]></referer>       <referer><![CDATA[https://www.openstreetmap.org/]]></referer>
 +      <user-agent>MyApp</user-agent>
              
       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>
Line 75: Line 79:
 </aqx> </aqx>
 </file> </file>
 +
 +The ''"**type**"'' attribute allows to define the type of the map. If no preview is available, the application will use common preview based on the map type. Can be one of ''"**roads**"'', ''"**topo**"'', ''"**satellite**"'', ''"**hybrid**"'', ''"**nautical**"'', ''"**aeronautical**"'', ''"**historical**"'', ''"**hillshade**"'', ''"**contours**"''.
  
 An ''**<outline>**'' tag (pairs of longitudes/latitudes, space separated) can be used to define the area covered by the map. When the map is selected while another area is displayed, the application will ask the user if he wants to move the map over the covered area. An ''**<outline>**'' tag (pairs of longitudes/latitudes, space separated) can be used to define the area covered by the map. When the map is selected while another area is displayed, the application will ask the user if he wants to move the map over the covered area.
Line 80: Line 86:
 The ''**<preview-location>**'' tag (approximate longitude, latitude and OSM zoom id) allows the application to display the map with a preview background: The ''**<preview-location>**'' tag (approximate longitude, latitude and OSM zoom id) allows the application to display the map with a preview background:
 {{ :en:help:v2:maps:on-demand-create-preview-2.jpg?nolink }} {{ :en:help:v2:maps:on-demand-create-preview-2.jpg?nolink }}
 +
 +The ''"**insecure**"'' attribute tells the application to accepts all HTTPS certificates without checking them (usually fixes most SSL related issues).
  
 The ''**<update-delay>**'' tag indicates after how many time the stored map data should be updated if it's used again. The default is ''**None**'', meaning the application will never try to update the stored data. Must end with ''**D**'' (number of days), ''**W**'' (weeks), ''**M**'' (months) or ''**Y**'' (years). For example, ''**3M**'' means 3 months. Use ''**0D**'' to force the application to update the data on each display. The ''**<update-delay>**'' tag indicates after how many time the stored map data should be updated if it's used again. The default is ''**None**'', meaning the application will never try to update the stored data. Must end with ''**D**'' (number of days), ''**W**'' (weeks), ''**M**'' (months) or ''**Y**'' (years). For example, ''**3M**'' means 3 months. Use ''**0D**'' to force the application to update the data on each display.
  
-The optional ''"**type**"'' attribute allows to define the type of the map. If no preview is available, the application will use common preview based on the map type. Can be one of ''"**roads**"'', ''"**topo**"'', ''"**satellite**"'', ''"**hybrid**"'', ''"**nautical**"'', ''"**aeronautical**"'', ''"**historical**"'', ''"**hillshade**"'', ''"**contours**"''.+You can limit the number of threads used to download the map using the ''**<max-threads>**'' tag. The default and maximum value is ''**3**''.
  
-==== Map layer ====+The ''**<key-url>**'' tag can be used to provide a link to the key (legend) of the map. The map key is available from the menu of a map. 
 + 
 +The ''**<referer>**'' and ''**<user-agent>**'' tags allow you to specify what is sent in the HTTP get headers when contacting the map server. 
 + 
 +\\ 
 + 
 +===== Map layer =====
 \\ \\
 The difference between regular maps and map layers is that a map layer is added over the current map when being selected. This is usually used for maps having a transparent background. Here is how to define a map layer: The difference between regular maps and map layers is that a map layer is added over the current map when being selected. This is usually used for maps having a transparent background. Here is how to define a map layer:
  
 <code xml> <code xml>
-  <source id="LAYER01" layer="true" opacity="50">+  <source id="MAP_UID" layer="true" opacity="50">
     <name>Map Layer Example</name>     <name>Map Layer Example</name>
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1-17">
       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>       <server><![CDATA[https://a.tile.openstreetmap.org/{$z}/{$x}/{$y}.png]]></server>
     </zoom-levels>     </zoom-levels>
Line 107: Line 121:
  
 <code xml> <code xml>
-  <source id="MAP02">+  <source id="MAP_UID">
     <name>Quadtree Map Example</name>     <name>Quadtree Map Example</name>
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1-17">
       <server><![CDATA[https://map.example.com/tiles/{$q}]]></server>       <server><![CDATA[https://map.example.com/tiles/{$q}]]></server>
     </zoom-levels>     </zoom-levels>
Line 117: Line 131:
 \\ \\
  
-===== Custom variables =====+===== Force a particular map projection =====
 \\ \\
-In addition to the variables provided by default, you can create your own variables defined by mathematical expressions:+By default, the application uses the "WGS 84 / Pseudo-Mercator" map projection ([[https://epsg.io/3857|EPSG:3857]]). You can force a different map projection by using the ''**<projection-code>**'' tag:
  
 <code xml> <code xml>
-  <source id="MAP03"> +  <source id="MAP_UID_1"> 
-    <name>Custom Variables Map Example</name> +    <name>KKJ/4 Projection</name> 
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17"> +    <zoom-levels z="1-17">     
-      <expression set="my_variable" type="int">iif( z>10, x*y, x+y )</expression+      <projection-code>EPSG:2394</projection-code
-      <server><![CDATA[https://map.example.com/tiles/{$my_variable}.png]]></server>+      <server><![CDATA[https://map.example.com/tiles/{$z}/{$x}/{$y}]]></server>
     </zoom-levels>     </zoom-levels>
   </source>   </source>
 </code> </code>
  
-The ''"**set**"'' attribute defines the name of the custom variable, the ''"**type**"'' attribute tells how to display the variable (either ''"**int**"'', ''"**long**"''''"**float**"'' or ''"**double**"'').+In case you want to use a map projection which is not known by the applicationyou can import its WKT or PROJ definition:
  
-Most common functions and operators can be usedfor example ''"**abs(x)**"''''"**sqrt(x)**"''''"**hypot(x,y)**"''''"**cos(x)**"''''"**charat(str,index)**"''''"**replace(str,target,replace)**"''''"**deg_to_rad(x)**"''''"**dist_eucl(x1,y1,x2,y2)**"''''"**md5(str)**"''''"**rand_uni()**"''''"**quadtree(x,y,z)**"''etc.+<code xml> 
 +  <import-crs-txt-def code="MY_2394_DEF">PROJCS["KKJ / Finland zone 4",GEOGCS["KKJ",DATUM["Kartastokoordinaattijarjestelma_1966",SPHEROID["International 1924",6378388,297,AUTHORITY["EPSG","7022"]],AUTHORITY["EPSG","6123"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4123"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",30],PARAMETER["scale_factor",1],PARAMETER["false_easting",4500000],PARAMETER["false_northing",0],AUTHORITY["EPSG","2394"],AXIS["Y",EAST],AXIS["X",NORTH]]</import-crs-txt-def> 
 +  <source id="MAP_UID_2"> 
 +    <name>KKJ/4 Projection</name> 
 +    <zoom-levels z="1-17">     
 +      <projection-code>MY_2394_DEF</projection-code> 
 +      <server><![CDATA[https://map.example.com/tiles/{$z}/{$x}/{$y}]]></server> 
 +    </zoom-levels> 
 +  </source> 
 +</code>
  
 \\ \\
Line 139: Line 162:
 ===== WMS servers ===== ===== WMS servers =====
 \\ \\
-To access WMS servers, just use the ''**{$bbox}**'' variable. You can specify the coordinate system of the bounding box using the ''**<bbox-crs-code>**'' tag.+To access WMS servers, just use the ''**{$bbox}**'' variable in place of the bounding box ''**BBOX**'' WMS parameter. You can specify the coordinate system of the bounding box using the ''**<bbox-crs-code>**'' tag ([[https://epsg.io/3857|EPSG:3857]] by default).
  
 <code xml> <code xml>
-  <source id="MAP04">+  <source id="MAP_UID">
     <name>WMS Map Example</name>     <name>WMS Map Example</name>
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1-17">
       <bbox-crs-code>EPSG:4326</bbox-crs-code>       <bbox-crs-code>EPSG:4326</bbox-crs-code>
       <server><![CDATA[https://server.example.com/wms/Service?REQUEST=GetMap&VERSION=1.1.1&LAYERS=layer&FORMAT=image/png&BBOX={$bbox}&SRS=EPSG:4326&WIDTH=256&HEIGHT=256]]></server>       <server><![CDATA[https://server.example.com/wms/Service?REQUEST=GetMap&VERSION=1.1.1&LAYERS=layer&FORMAT=image/png&BBOX={$bbox}&SRS=EPSG:4326&WIDTH=256&HEIGHT=256]]></server>
Line 150: Line 173:
   </source>   </source>
 </code> </code>
 +
 +In the server requires a bounding box with integer numbers, you can use the ''**{$ibbox}**'' variable instead of ''**{$bbox}**''.
  
 \\ \\
Line 160: Line 185:
  
 <?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
-<aqx version="9">+<aqx version="11">
  
   <import-ogc-wkt-def code="EPSG:4218">GEOGCS["Bogota 1975",DATUM["Bogota_1975",SPHEROID["International 1924",6378388,297,AUTHORITY["EPSG","7022"]],TOWGS84[307,304,-318,0,0,0,0],AUTHORITY["EPSG","6218"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4218"]]</import-ogc-wkt-def>   <import-ogc-wkt-def code="EPSG:4218">GEOGCS["Bogota 1975",DATUM["Bogota_1975",SPHEROID["International 1924",6378388,297,AUTHORITY["EPSG","7022"]],TOWGS84[307,304,-318,0,0,0,0],AUTHORITY["EPSG","6218"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4218"]]</import-ogc-wkt-def>
  
-  <source id="MAP05">+  <source id="MAP_UID">
     <name>WMTS Map Example</name>     <name>WMTS Map Example</name>
          
Line 194: Line 219:
 </code> </code>
  
-To get the ''**<projection-resolution>**'' from a ''**ScaleDenominator**'', just multiply this value by ''**0.00028**'' (which is the "standardized rendering pixel size", in meter).+To get the ''**<projection-resolution>**'' from a ''**ScaleDenominator**'', just multiply this value by ''**0.00028**'' (which is the "standardized rendering pixel size", in meters).
  
 If you want to use a projection which is not natively supported by the application, you need to import its definition using the ''**<import-ogc-wkt-def>**'' tag. You can find the OGC WKT definition of almost all projections here: [[http://www.spatialreference.org/]]. If you want to use a projection which is not natively supported by the application, you need to import its definition using the ''**<import-ogc-wkt-def>**'' tag. You can find the OGC WKT definition of almost all projections here: [[http://www.spatialreference.org/]].
Line 202: Line 227:
 ===== Advanced features ===== ===== Advanced features =====
  
-==== How to make a color or a color range transparent====+==== Custom variables ==== 
 +\\ 
 +In addition to the variables provided by default, you can create your own variables defined by mathematical expressions: 
 + 
 +<code xml> 
 +  <source id="MAP_UID"> 
 +    <name>Custom Variables Map Example</name> 
 +    <zoom-levels z="1-17"> 
 +      <expression set="my_variable" type="int">iif( z>10, x*y, x+y )</expression> 
 +      <server><![CDATA[https://map.example.com/tiles/{$my_variable}.png]]></server> 
 +    </zoom-levels> 
 +  </source> 
 +</code> 
 + 
 +The ''"**set**"'' attribute defines the name of the custom variable, the ''"**type**"'' attribute tells how to display the variable (either ''"**int**"'', ''"**long**"'', ''"**float**"'' or ''"**double**"''). 
 + 
 +Most common functions and operators can be used, for example ''"**abs(x)**"'', ''"**sqrt(x)**"'', ''"**hypot(x,y)**"'', ''"**cos(x)**"'', ''"**charat(str,index)**"'', ''"**replace(str,target,replace)**"'', ''"**deg_to_rad(x)**"'', ''"**dist_eucl(x1,y1,x2,y2)**"'', ''"**md5(str)**"'', ''"**rand_uni()**"'', ''"**quadtree(x,y,z)**"'', etc. 
 + 
 +The ''**<expression>**'' tag and custom variables can only be used inside the zoom levels definition (i.e. a ''**<zoom-level>**'' and ''**<zoom-levels>**'' tag). The usual operator precedence is followed. 
 + 
 +[[en:help:v2:maps:on-demand-create#inline_expressions|See here for more details on available operators and functions.]] 
 + 
 +\\ 
 + 
 +==== Global parameters ==== 
 +\\ 
 +You can declare parameters at the file level, which may be useful to store a key or a token that is used in multiple places within the file. 
 + 
 +{{:icon_help.png?nolink|}} Global parameters are shared among all installed files, be sure to use different parameter names in all your files. 
 + 
 +<code xml> 
 +<?xml version="1.0" encoding="utf-8" ?> 
 +<aqx version="11"> 
 + 
 +  <name>Test global parameter</name> 
 + 
 +  <param name="key">8451-5814-5311</param> 
 + 
 +  <source id="MAP_UID_1"> 
 +    <name>Map 1</name> 
 +    <zoom-levels z="5-15"> 
 +      <server><![CDATA[https://example.server.com/style1/{$z}/{$x}/{$y}?token={$param:key}]]></server> 
 +    </zoom-levels> 
 +  </source> 
 + 
 +  <source id="MAP_UID_2"> 
 +    <name>Map 2</name> 
 +    <zoom-levels z="5-15"> 
 +      <server><![CDATA[https://example.server.com/style2/{$z}/{$x}/{$y}?token={$param:key}]]></server> 
 +    </zoom-levels> 
 +  </source> 
 + 
 +</aqx> 
 +</code> 
 + 
 +\\ 
 + 
 +==== Make a color or a color range transparent ====
 \\ \\
 You can make a color become transparent (erase the color) of any map. Just specify the RGB values of the color: You can make a color become transparent (erase the color) of any map. Just specify the RGB values of the color:
Line 230: Line 312:
 \\ \\
  
- +==== Send cookies or headers to the map server ====
-==== How to send cookies or headers to the map server====+
 \\ \\
-You can send headers using the ''**<header>**''tag and cookies using the ''**<cookies>**'' tag, as shown in the example below:+You can send headers using the ''**<header>**'' tag and cookies using the ''**<cookies>**'' tag, as shown in the example below:
  
 <code xml> <code xml>
    ...    ...
-    <zoom-levels z="3,5,7,8,9,10,11,12,13,14,15,16,17">+    <zoom-levels z="1-17">
       <header>Accept: */*</header>       <header>Accept: */*</header>
       <cookie>_usr_name=Name;_usr_password=123</cookie>       <cookie>_usr_name=Name;_usr_password=123</cookie>
Line 252: Line 333:
 \\ \\
 ^  AQX file version  ^  Min. app version  ^  Notable changes  ^ ^  AQX file version  ^  Min. app version  ^  Notable changes  ^
 +|  12  |  2.3.3  | Map resolution for geodetic CRS now expressed in deg/px instead of m/px. Default CRS for WMS BBOX is now EPSG:3857 (WGS 84 / Pseudo-Mercator). Added support for ''**sha1**'' and ''**hash**'' hash functions.  |
 +|  11  |  2.3.0  | Added support for ''**polar stereographic**'' projections.  |
 |  10  |  2.2.5  | Added support for composite sources. Added support for ''**insecure**'' parameter. Added support for ''**unixtime**'' and ''**tostring(int,radix)**'' functions. Added support for ''**{$y!}**'' variable.  | |  10  |  2.2.5  | Added support for composite sources. Added support for ''**insecure**'' parameter. Added support for ''**unixtime**'' and ''**tostring(int,radix)**'' functions. Added support for ''**{$y!}**'' variable.  |
 |  9  |  2.0.4  | Added support for ''**default-location**'' tag. Added support for ''**china-offset**'' and ''**clear-color**'' parameters. Added support for ''**md5**'' function. Sources parameter ''**opacity**'' expressed in percent (0-100) instead of 0-255.  | |  9  |  2.0.4  | Added support for ''**default-location**'' tag. Added support for ''**china-offset**'' and ''**clear-color**'' parameters. Added support for ''**md5**'' function. Sources parameter ''**opacity**'' expressed in percent (0-100) instead of 0-255.  |
Line 263: Line 346:
  
 === List of operators === === List of operators ===
-\\+
 ^ Operator  ^ Note  ^ ^ Operator  ^ Note  ^
 |  ''**+**''  | Additive operator (also used for string concatenation).  | |  ''**+**''  | Additive operator (also used for string concatenation).  |
Line 284: Line 367:
 <sup>1. Available from AQ 2.2.8c</sup> <sup>1. Available from AQ 2.2.8c</sup>
  
-\\ 
  
 === List of variables === === List of variables ===
-\\+
 ^ Variable  ^ Note  ^ ^ Variable  ^ Note  ^
 |  ''**c**''  | The speed of light in vacuum.  | |  ''**c**''  | The speed of light in vacuum.  |
Line 296: Line 378:
 |  ''**q**''  | The elementary charge.  | |  ''**q**''  | The elementary charge.  |
  
-\\ 
  
 === List of common functions === === List of common functions ===
-\\+
 ^ Function  ^ Return type  ^ Note  ^ ^ Function  ^ Return type  ^ Note  ^
 | ''**abs**(double)''  | ''double''  | Returns the absolute value of a double value.  | | ''**abs**(double)''  | ''double''  | Returns the absolute value of a double value.  |
Line 308: Line 389:
 | ''**charAt**(string,long)''  | ''string''  | Returns the char value at the specified index.  | | ''**charAt**(string,long)''  | ''string''  | Returns the char value at the specified index.  |
 | ''**cos**(double)''  | ''double''  | Returns the trigonometric cosine of an angle.  | | ''**cos**(double)''  | ''double''  | Returns the trigonometric cosine of an angle.  |
 +| ''**deg_to_rad**(double)''  | ''double''  | Converts from degrees to radians.  |
 +| ''**dist_eucl**(double,double,double,double)''  | ''double''  | Computes the Euclidean distance between to points ''x1'' (first parameter), ''y1'' (second parameter) and ''x2'' (third parameter), ''y2'' (fourth parameter) as defined by ''hypot( (x2-x1), (y2-y1) )'' |
 | ''**exp**(double)''  | ''double''  | Returns Euler's number ''e'' raised to the power of a double value.  | | ''**exp**(double)''  | ''double''  | Returns Euler's number ''e'' raised to the power of a double value.  |
 | ''**fact**(long)''  | ''long''  | Return the product of all positive integers less than or equal to the specified value.  | | ''**fact**(long)''  | ''long''  | Return the product of all positive integers less than or equal to the specified value.  |
 | ''**floor**(double)''  | ''long''  | Returns the largest (closest to positive infinity) double value that is less than or equal to the argument and is equal to a mathematical integer.  | | ''**floor**(double)''  | ''long''  | Returns the largest (closest to positive infinity) double value that is less than or equal to the argument and is equal to a mathematical integer.  |
-| ''**format**(string,double)''  | ''string''  | Returns a formatted string of the second parameter value, using the format string specified by the first parameter. [[https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html#syntax|See here for the format details]].  |+| ''**format**(string,double)''  | ''string''  | Returns a formatted string of the second parameter value, using the format string specified by the first parameter. [[https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html#syntax|See here for the format details]]. Example: ''format("%tm",(unixtime(1)))'' gives the current month number with two digits. 
 +| ''**hash**(string,string)''  | ''string''  | Returns the hash of the second string parameter, using the algorithm given in the first string parameter.  |
 | ''**hypot**(double,double)''  | ''double''  | Returns ''sqrt(x²+y²)'' without intermediate overflow or underflow.  | | ''**hypot**(double,double)''  | ''double''  | Returns ''sqrt(x²+y²)'' without intermediate overflow or underflow.  |
 | ''**iif**(double,mixed,mixed)''  | ''mixed''  | If the first parameter is different from ''0.0'', return the second parameter, else the third one.  | | ''**iif**(double,mixed,mixed)''  | ''mixed''  | If the first parameter is different from ''0.0'', return the second parameter, else the third one.  |
Line 317: Line 401:
 | ''**ln**(double)''  | ''double''  | Returns the natural logarithm (base ''e'') of a double value.  | | ''**ln**(double)''  | ''double''  | Returns the natural logarithm (base ''e'') of a double value.  |
 | ''**log**(double)''  | ''double''  | Returns the base 10 logarithm of a double value.  | | ''**log**(double)''  | ''double''  | Returns the base 10 logarithm of a double value.  |
 +| ''**md5**(string)''  | ''string''  | Returns the [[https://en.wikipedia.org/wiki/MD5|MD5 hash]] of the string parameter.  |
 | ''**not**(double)''  | ''long''  | If the parameter is different from ''0.0'', return ''0'', else return ''1'' | | ''**not**(double)''  | ''long''  | If the parameter is different from ''0.0'', return ''0'', else return ''1'' |
 | ''**pow**(double,double)''  | ''double''  | Returns the value of the first argument raised to the power of the second argument.  | | ''**pow**(double,double)''  | ''double''  | Returns the value of the first argument raised to the power of the second argument.  |
 +| ''**quadtree**(long,long,long)''  | ''string''  | Combines the x (first parameter), x (second parameter) and zoom (third parameter) values into a one-dimensional [[https://docs.microsoft.com/en-us/bingmaps/articles/bing-maps-tile-system?redirectedfrom=MSDN#tile-coordinates-and-quadkeys|quadtree key string]].  |
 +| ''**rad_to_deg**(double)''  | ''double''  | Converts from radians to degrees.  |
 +| ''**rand_uni**()''  | ''double''  | Returns a double value with a positive sign, greater than or equal to ''0.0'' and less than ''1.0''. Returned values are chosen pseudorandomly with (approximately) uniform distribution from that range.  |
 | ''**replace**(string,string,string)''  | ''string''  | Replaces each substring of a string (first parameter) that matches the literal target sequence (second parameter) with the specified literal replacement sequence (third parameter).  | | ''**replace**(string,string,string)''  | ''string''  | Replaces each substring of a string (first parameter) that matches the literal target sequence (second parameter) with the specified literal replacement sequence (third parameter).  |
 | ''**round**(double)''  | ''long''  | Returns the closest long to the argument, with ties rounding to positive infinity.  | | ''**round**(double)''  | ''long''  | Returns the closest long to the argument, with ties rounding to positive infinity.  |
 +| ''**sha1**(string)''  | ''string''  | Returns the [[https://en.wikipedia.org/wiki/SHA-1|SHA-1 hash]] of the string parameter.  |
 | ''**sin**(double)'' <sup>1</sup>  | ''double''  | Returns the trigonometric sine of an angle.  | | ''**sin**(double)'' <sup>1</sup>  | ''double''  | Returns the trigonometric sine of an angle.  |
 | ''**sqrt**(double)''  | ''double''  | Returns the correctly rounded positive square root of a double value.  | | ''**sqrt**(double)''  | ''double''  | Returns the correctly rounded positive square root of a double value.  |
Line 334: Line 423:
 | ''**valueAt**(long,mixed...)''  | ''mixed''  | Returns the value at the index (starting from zero after the first parameter) specified by the first parameter.  | | ''**valueAt**(long,mixed...)''  | ''mixed''  | Returns the value at the index (starting from zero after the first parameter) specified by the first parameter.  |
 <sup>1. Available from AQ 2.2.8c</sup> <sup>1. Available from AQ 2.2.8c</sup>
- 
-\\ 
- 
-=== List of specialized functions === 
-\\ 
-^ Function  ^ Return type  ^ Note  ^ 
-| ''**deg_to_rad**(double)''  | ''double''  | Converts from degrees to radians.  | 
-| ''**dist_eucl**(double,double,double,double)''  | ''double''  | Computes the Euclidean distance between to points ''x1'' (first parameter), ''y1'' (second parameter) and ''x2'' (third parameter), ''y2'' (fourth parameter) as defined by ''hypot( (x2-x1), (y2-y1) )'' | 
-| ''**md5**(string)''  | ''string''  | Returns the [[https://en.wikipedia.org/wiki/MD5|MD5 hash]] of the string parameter.  | 
-| ''**quadtree**(long,long,long)''  | ''string''  | Combines the x (first parameter), x (second parameter) and zoom (third parameter) values into a one-dimensional [[https://docs.microsoft.com/en-us/bingmaps/articles/bing-maps-tile-system?redirectedfrom=MSDN#tile-coordinates-and-quadkeys|quadtree key string]].  | 
-| ''**rad_to_deg**(double)''  | ''double''  | Converts from radians to degrees.  | 
-| ''**rand_uni**()''  | ''double''  | Returns a double value with a positive sign, greater than or equal to ''0.0'' and less than ''1.0''. Returned values are chosen pseudorandomly with (approximately) uniform distribution from that range.  |