From: Raúl Marín Rodríguez Date: Fri, 29 Mar 2019 15:56:43 +0000 (+0000) Subject: Fix various misspellings of "geometry" X-Git-Tag: 3.0.0alpha1~65 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cd4a0043f44ca8c0943e25a15aa62fdbed8b1b6;p=postgis Fix various misspellings of "geometry" Patch by François Bonzon Closes https://github.com/postgis/postgis/pull/389 git-svn-id: http://svn.osgeo.org/postgis/trunk@17371 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/doc/po/ja/reference_processing.xml.po b/doc/po/ja/reference_processing.xml.po index f1075d8f7..0d908aaa4 100644 --- a/doc/po/ja/reference_processing.xml.po +++ b/doc/po/ja/reference_processing.xml.po @@ -2672,7 +2672,7 @@ msgstr "ST_DumpPoints" msgid "" "Returns a set of geometry_dump (geom,path) rows of all points that make up a " "geometry." -msgstr "ジオメトリを作る全ての点のgometry_dump(geom,path)行の集合を返します。" +msgstr "ジオメトリを作る全ての点のgeometry_dump(geom,path)行の集合を返します。" #. Tag: funcprototype #: reference_processing.xml:1021 diff --git a/doc/reference_accessor.xml b/doc/reference_accessor.xml index 84e428972..65a125fe4 100644 --- a/doc/reference_accessor.xml +++ b/doc/reference_accessor.xml @@ -2151,7 +2151,7 @@ GROUP BY gid, field1,field2; >Return the 1-based Nth geometry (face) if the geometry is a POLYHEDRALSURFACE, POLYHEDRALSURFACEM. Otherwise, return NULL. This returns the same answer as ST_GeometryN for Polyhedral Surfaces. - Using ST_GemoetryN is faster. + Using ST_GeometryN is faster. Index is 1-based. @@ -2265,19 +2265,21 @@ FROM ( VALUES ('LINESTRING(0 0, 1 1, 2 2)'::geometry) ) AS foo; (3 rows) --Example circular string -SELECT ST_AsText(ST_PointN(ST_GeomFromText('CIRCULARSTRING(1 2, 3 2, 1 2)'),2)); +SELECT ST_AsText(ST_PointN(ST_GeomFromText('CIRCULARSTRING(1 2, 3 2, 1 2)'), 2)); -st_astext ----------- -POINT(3 2) + st_astext +------------ + POINT(3 2) +(1 row) -SELECT st_astext(f) -FROM ST_GeometryFromtext('LINESTRING(0 0 0, 1 1 1, 2 2 2)') as g - ,ST_PointN(g, -2) AS f -- 1 based index +SELECT ST_AsText(f) +FROM ST_GeomFromText('LINESTRING(0 0 0, 1 1 1, 2 2 2)') AS g + ,ST_PointN(g, -2) AS f; -- 1 based index -st_astext ----------- -"POINT Z (1 1 1)" + st_astext +----------------- + POINT Z (1 1 1) +(1 row) diff --git a/doc/reference_editor.xml b/doc/reference_editor.xml index 6d236bb65..10bdae63f 100644 --- a/doc/reference_editor.xml +++ b/doc/reference_editor.xml @@ -1504,7 +1504,7 @@ SELECT ST_AsEWKT(ST_SnapToGrid(ST_GeomFromEWKT('LINESTRING(-1.1115678 2.123 3 2. Description - Snaps the vertices and segments of a geometry + Snaps the vertices and segments of a geometry to another Geometry's vertices. A snap distance tolerance is used to control where snapping is performed. The result geometry is the input geometry with the vertices snapped. @@ -1573,7 +1573,6 @@ FROM (SELECT ( 51 150, 101 150, 76 175, 51 150 )), (( 151 100, 151 200, 176 175, 151 100 )))') As poly, ST_GeomFromText('LINESTRING (5 107, 54 84, 101 100)') As line - ) As foo; polysnapped @@ -1601,7 +1600,6 @@ FROM (SELECT ( 51 150, 101 150, 76 175, 51 150 )), (( 151 100, 151 200, 176 175, 151 100 )))') As poly, ST_GeomFromText('LINESTRING (5 107, 54 84, 101 100)') As line - ) As foo; polysnapped diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml index ea7a4e0d8..193e76582 100644 --- a/doc/reference_processing.xml +++ b/doc/reference_processing.xml @@ -3603,11 +3603,11 @@ FROM (SELECT 'POLYGON((0 0, 8 8, 0 16, 0 0))'::geometry geom) As foo; Filters away vertex points based on their m-value. Returns a geometry with only vertex points that have a m-value larger or equal to the min value and smaller or equal to the max value. If max-value argument is left out only min value is considered. If fourth argument is left out the m-value - will not be in the resulting geoemtry. If resulting geometry have too few vertex points left for its geometry type an empty - geoemtry will be returned. In a geometry collection + will not be in the resulting geometry. If resulting geometry have too few vertex points left for its geometry type an empty + geometry will be returned. In a geometry collection geometries without enough points will just be left out silently. If This function is mainly intended to be used in conjunction with ST_SetEffectiveArea. ST_EffectiveArea sets the effective area - of a vertex in it's m-value. With ST_FilterByM it then is possible to get a simplified version of the geoemtry without any calculations, just by filtering + of a vertex in it's m-value. With ST_FilterByM it then is possible to get a simplified version of the geometry without any calculations, just by filtering There is a difference in what ST_SimplifyVW returns when not enough points meets the creterias compared to ST_FilterByM. ST_SimplifyVW returns the geometry with enough points while ST_FilterByM returns an empty geometry diff --git a/extras/history_table/history_table.sql b/extras/history_table/history_table.sql index ac79ca686..57e65ceb8 100644 --- a/extras/history_table/history_table.sql +++ b/extras/history_table/history_table.sql @@ -226,6 +226,6 @@ language 'plpgsql' /*TODO LIST: -CREATE A FUNCTION THAT WILL DROP A CERTAIN HISTORIC TABLE AND REMOVE ITS ITENS FROM GEOMERTY_COLUMNS AND HISTORIC_INFORMATION -CREATE A FUNCTION TO POPULATE ALL THE EXISTING RECORDS TO THE HISTORIC TABLE, AS A INSERT -*/ \ No newline at end of file +CREATE A FUNCTION THAT WILL DROP A CERTAIN HISTORIC TABLE AND REMOVE ITS ITEMS FROM GEOMETRY_COLUMNS AND HISTORIC_INFORMATION +CREATE A FUNCTION TO POPULATE ALL THE EXISTING RECORDS TO THE HISTORIC TABLE, AS AN INSERT +*/ diff --git a/extras/ogc_test_suite/1_schema.sql b/extras/ogc_test_suite/1_schema.sql index f865b25e3..1687e2616 100644 --- a/extras/ogc_test_suite/1_schema.sql +++ b/extras/ogc_test_suite/1_schema.sql @@ -508,7 +508,7 @@ CREATE TABLE map_neatlines ( -- POPULATE GEOMETRY AND FEATURE TABLES -- -- *** ADAPTATION ALERT *** --- This script DOES NOT make any inserts into a GEOMTERY_COLUMNS table/view. +-- This script DOES NOT make any inserts into a GEOMETRY_COLUMNS table/view. -- Implementers should insert whatever makes this happen in their implementation -- below. Furthermore, the inserts below may be replaced by whatever mechanism -- may be provided by implementers to insert rows in feature tables such that diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in index ce5803aff..f9d60f1bb 100644 --- a/liblwgeom/liblwgeom.h.in +++ b/liblwgeom/liblwgeom.h.in @@ -2061,8 +2061,8 @@ LWGEOM_UNPARSER_RESULT; #define TWKB_BBOX 0x01 /* User wants bboxes */ #define TWKB_SIZE 0x02 /* User wants sizes */ #define TWKB_ID 0x04 /* User wants id */ -#define TWKB_NO_TYPE 0x10 /* No type because it is a sub geoemtry */ -#define TWKB_NO_ID 0x20 /* No ID because it is a subgeoemtry */ +#define TWKB_NO_TYPE 0x10 /* No type because it is a sub geometry */ +#define TWKB_NO_ID 0x20 /* No ID because it is a subgeometry */ #define TWKB_DEFAULT_PRECISION 0 /* Aim for 1m (or ft) rounding by default */ /* diff --git a/loader/README.pgsql2shp b/loader/README.pgsql2shp index 06d74dafc..4f536285d 100644 --- a/loader/README.pgsql2shp +++ b/loader/README.pgsql2shp @@ -53,8 +53,8 @@ OPTIONS this will reduce the likelihood of coordinate drift due to con- version to and from WKT format. Coordinate drifts will not occur with PostGIS 1.0.0 and newer versions. It will be slightly - faster, but might fail if any NON-gemetry column lacks a cast to - text. + faster, but might fail if any NON-geometry column lacks a cast + to text. -r Raw mode. Do not drop the gid field, or escape column names. diff --git a/regress/core/sql-mm-compoundcurve.sql b/regress/core/sql-mm-compoundcurve.sql index d287ff9eb..8aaff2d5b 100644 --- a/regress/core/sql-mm-compoundcurve.sql +++ b/regress/core/sql-mm-compoundcurve.sql @@ -159,10 +159,10 @@ UPDATE public.compoundcurve 2 0, 0 0))'); -SELECT 'astext01', ST_Astext(the_geom_2d) FROM public.compoundcurve; -SELECT 'astext02', ST_Astext(the_geom_3dm) FROM public.compoundcurve; -SELECT 'astext03', ST_Astext(the_geom_3dz) FROM public.compoundcurve; -SELECT 'astext04', ST_Astext(the_geom_4d) FROM public.compoundcurve; +SELECT 'astext01', ST_AsText(the_geom_2d) FROM public.compoundcurve; +SELECT 'astext02', ST_AsText(the_geom_3dm) FROM public.compoundcurve; +SELECT 'astext03', ST_AsText(the_geom_3dz) FROM public.compoundcurve; +SELECT 'astext04', ST_AsText(the_geom_4d) FROM public.compoundcurve; SELECT 'asewkt01', ST_Asewkt(the_geom_2d) FROM public.compoundcurve; SELECT 'asewkt02', ST_Asewkt(the_geom_3dm) FROM public.compoundcurve;