Merge pull request #6985 from pigreco/help_in_linea_field_calc

m-kuhn · web-flow · commit 3ea6432bb936 · 2018-05-14T18:17:31.000+02:00
corrections function_help
diff --git a/resources/function_help/json/array_intersect b/resources/function_help/json/array_intersect
@@ -1,7 +1,7 @@
 {
   "name": "array_intersect",
   "type": "function",
-  "description": "Returns true if any element of array1 exists in array2.",
+  "description": "Returns true if at least one element of array1 exists in array2.",
   "arguments": [ {"arg":"array1","description":"an array"},
                  {"arg":"array2","description":"another array"}],
   "examples": [ { "expression":"array_intersect(array(1,2,3,4),array(4,0,2,5))", "returns":"true"}]
diff --git a/resources/function_help/json/make_circle b/resources/function_help/json/make_circle
@@ -8,7 +8,7 @@
 	{"arg":"radius", "description": "radius of the circle"},
         {"arg":"segment", "description": "optional argument for polygon segmentation. By default this value is 36"}],
   "examples": [ { "expression":"geom_to_wkt(make_circle(make_point(10,10), 5, 4))", "returns":"'Polygon ((10 15, 15 10, 10 5, 5 10, 10 15))'"},
-    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 4))", "returns":"'Polygon ((10 15 5, 15 10 5, 10 5 5, 5 10 5, 10 15 5))'"},
-    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 4))", "returns":"'Polygon ((10 15 5 30, 15 10 5 30, 10 5 5 30, 5 10 5 30, 10 15 5 30))'"}
+    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 4))", "returns":"'PolygonZ ((10 15 5, 15 10 5, 10 5 5, 5 10 5, 10 15 5))'"},
+    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 4))", "returns":"'PolygonZM ((10 15 5 30, 15 10 5 30, 10 5 5 30, 5 10 5 30, 10 15 5 30))'"}
     ]
 }
diff --git a/resources/function_help/json/make_ellipse b/resources/function_help/json/make_ellipse
@@ -10,7 +10,7 @@
 	{"arg":"azimuth", "description": "orientation of the ellipse"},
         {"arg":"segment", "description": "optional argument for polygon segmentation. By default this value is 36"}],
   "examples": [ { "expression":"geom_to_wkt(make_ellipse(make_point(10,10), 5, 2, 90, 4))", "returns":"'Polygon ((15 10, 10 8, 5 10, 10 12, 15 10))'"},
-    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 2, 90, 4))", "returns":"'Polygon ((15 10 5, 10 8 5, 5 10 5, 10 12 5, 15 10 5))'"},
-    { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 2, 90, 4))", "returns":"'Polygon ((15 10 5 30, 10 8 5 30, 5 10 5 30, 10 12 5 30, 15 10 5 30))'"}
+    { "expression":"geom_to_wkt(make_ellipse(make_point(10,10,5), 5, 2, 90, 4))", "returns":"'PolygonZ ((15 10 5, 10 8 5, 5 10 5, 10 12 5, 15 10 5))'"},
+    { "expression":"geom_to_wkt(make_ellipse(make_point(10,10,5,30), 5, 2, 90, 4))", "returns":"'PolygonZM ((15 10 5 30, 10 8 5 30, 5 10 5 30, 10 12 5 30, 15 10 5 30))'"}
     ]
 }
diff --git a/resources/function_help/json/num_geometries b/resources/function_help/json/num_geometries
@@ -3,5 +3,5 @@
   "type": "function",
   "description": "Returns the number of geometries in a geometry collection, or null if the input geometry is not a collection.",
   "arguments": [ {"arg":"geometry","description":"geometry collection"} ],
-  "examples": [ { "expression":"num_geometries(geom_from_wkt('GEOMETRYCOLLECTION(POINT(0 1), POINT(0 0), POINT(1 0), POINT(1 1))'))'),3))", "returns":"4"}]
+  "examples": [ { "expression":"num_geometries(geom_from_wkt('GEOMETRYCOLLECTION(POINT(0 1), POINT(0 0), POINT(1 0), POINT(1 1))'))", "returns":"4"}]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "array_intersect",`
`3`	`3`	`"type": "function",`
`4`		`- "description": "Returns true if any element of array1 exists in array2.",`
	`4`	`+ "description": "Returns true if at least one element of array1 exists in array2.",`
`5`	`5`	`"arguments": [ {"arg":"array1","description":"an array"},`
`6`	`6`	`{"arg":"array2","description":"another array"}],`
`7`	`7`	`"examples": [ { "expression":"array_intersect(array(1,2,3,4),array(4,0,2,5))", "returns":"true"}]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`{"arg":"radius", "description": "radius of the circle"},`
`9`	`9`	`{"arg":"segment", "description": "optional argument for polygon segmentation. By default this value is 36"}],`
`10`	`10`	`"examples": [ { "expression":"geom_to_wkt(make_circle(make_point(10,10), 5, 4))", "returns":"'Polygon ((10 15, 15 10, 10 5, 5 10, 10 15))'"},`
`11`		`- { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 4))", "returns":"'Polygon ((10 15 5, 15 10 5, 10 5 5, 5 10 5, 10 15 5))'"},`
`12`		`- { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 4))", "returns":"'Polygon ((10 15 5 30, 15 10 5 30, 10 5 5 30, 5 10 5 30, 10 15 5 30))'"}`
	`11`	`+ { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 4))", "returns":"'PolygonZ ((10 15 5, 15 10 5, 10 5 5, 5 10 5, 10 15 5))'"},`
	`12`	`+ { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 4))", "returns":"'PolygonZM ((10 15 5 30, 15 10 5 30, 10 5 5 30, 5 10 5 30, 10 15 5 30))'"}`
`13`	`13`	`]`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`{"arg":"azimuth", "description": "orientation of the ellipse"},`
`11`	`11`	`{"arg":"segment", "description": "optional argument for polygon segmentation. By default this value is 36"}],`
`12`	`12`	`"examples": [ { "expression":"geom_to_wkt(make_ellipse(make_point(10,10), 5, 2, 90, 4))", "returns":"'Polygon ((15 10, 10 8, 5 10, 10 12, 15 10))'"},`
`13`		`- { "expression":"geom_to_wkt(make_circle(make_point(10,10,5), 5, 2, 90, 4))", "returns":"'Polygon ((15 10 5, 10 8 5, 5 10 5, 10 12 5, 15 10 5))'"},`
`14`		`- { "expression":"geom_to_wkt(make_circle(make_point(10,10,5,30), 5, 2, 90, 4))", "returns":"'Polygon ((15 10 5 30, 10 8 5 30, 5 10 5 30, 10 12 5 30, 15 10 5 30))'"}`
	`13`	`+ { "expression":"geom_to_wkt(make_ellipse(make_point(10,10,5), 5, 2, 90, 4))", "returns":"'PolygonZ ((15 10 5, 10 8 5, 5 10 5, 10 12 5, 15 10 5))'"},`
	`14`	`+ { "expression":"geom_to_wkt(make_ellipse(make_point(10,10,5,30), 5, 2, 90, 4))", "returns":"'PolygonZM ((15 10 5 30, 10 8 5 30, 5 10 5 30, 10 12 5 30, 15 10 5 30))'"}`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`"type": "function",`
`4`	`4`	`"description": "Returns the number of geometries in a geometry collection, or null if the input geometry is not a collection.",`
`5`	`5`	`"arguments": [ {"arg":"geometry","description":"geometry collection"} ],`
`6`		`- "examples": [ { "expression":"num_geometries(geom_from_wkt('GEOMETRYCOLLECTION(POINT(0 1), POINT(0 0), POINT(1 0), POINT(1 1))'))'),3))", "returns":"4"}]`
	`6`	`+ "examples": [ { "expression":"num_geometries(geom_from_wkt('GEOMETRYCOLLECTION(POINT(0 1), POINT(0 0), POINT(1 0), POINT(1 1))'))", "returns":"4"}]`
`7`	`7`	`}`