Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various misspellings of "geometry" #389

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/po/ja/reference_processing.xml.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 13 additions & 11 deletions doc/reference_accessor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2151,7 +2151,7 @@ GROUP BY gid, field1,field2;
<para>>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.</para>
Using ST_GeometryN is faster.</para>

<note>
<para>Index is 1-based.</para>
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM ST_GeomFromText('LINESTRING(0 0 0, 1 1 1, 2 2 2)') AS g
FROM 'LINESTRING(0 0 0, 1 1 1, 2 2 2)'::geometry 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)

</programlisting>
</refsection>
Expand Down
4 changes: 1 addition & 3 deletions doc/reference_editor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ SELECT ST_AsEWKT(ST_SnapToGrid(ST_GeomFromEWKT('LINESTRING(-1.1115678 2.123 3 2.
<title>Description</title>

<para>
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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions doc/reference_processing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3603,11 +3603,11 @@ FROM (SELECT 'POLYGON((0 0, 8 8, 0 16, 0 0))'::geometry geom) As foo;
<para>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 </para>
<para>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</para>
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</para>

<note><para>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</para></note>
Expand Down
6 changes: 3 additions & 3 deletions extras/history_table/history_table.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
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
*/
2 changes: 1 addition & 1 deletion extras/ogc_test_suite/1_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions liblwgeom/liblwgeom.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

/*
Expand Down
4 changes: 2 additions & 2 deletions loader/README.pgsql2shp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions regress/core/sql-mm-compoundcurve.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down