From 4a0b17f54875966ad85c01e3d0bd817fde9194ff Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Sat, 4 Jul 2026 18:49:13 +0000 Subject: [PATCH] Rename LOCATIONS_GPS -> LOCATIONS_UTM --- db/schemas/sokwedb/indexes/Makefile | 2 +- .../{locations_gps.m4 => locations_utm.m4} | 8 +-- .../{locations_gps.m4 => locations_utm.m4} | 8 +-- db/schemas/sokwedb/tables/Makefile | 2 +- .../{locations_gps.m4 => locations_utm.m4} | 6 +- doc/diagrams/events.svg | 2 +- doc/src/epilog.inc.m4 | 38 +++++------ doc/src/tables.m4 | 2 +- doc/src/tables/events.m4 | 10 +-- .../{locations_gps.m4 => locations_utm.m4} | 64 +++++++++---------- 10 files changed, 71 insertions(+), 71 deletions(-) rename db/schemas/sokwedb/indexes/create/{locations_gps.m4 => locations_utm.m4} (79%) rename db/schemas/sokwedb/indexes/drop/{locations_gps.m4 => locations_utm.m4} (84%) rename db/schemas/sokwedb/tables/create/{locations_gps.m4 => locations_utm.m4} (95%) rename doc/src/tables/{locations_gps.m4 => locations_utm.m4} (78%) diff --git a/db/schemas/sokwedb/indexes/Makefile b/db/schemas/sokwedb/indexes/Makefile index ab3d9ed..ebf1fa3 100644 --- a/db/schemas/sokwedb/indexes/Makefile +++ b/db/schemas/sokwedb/indexes/Makefile @@ -23,7 +23,7 @@ ORDER := biography_data biography_log comm_membs comm_memb_log \ watches follow_observers follow_studies events roles arrivals \ swelling_sources swelling_states aggression_event_log sightings \ aggressions food_events groomings attendance \ - arrivals_a species_present repro_states locations_gps locations_map \ + arrivals_a species_present repro_states locations_utm locations_map \ colobus matings ## diff --git a/db/schemas/sokwedb/indexes/create/locations_gps.m4 b/db/schemas/sokwedb/indexes/create/locations_utm.m4 similarity index 79% rename from db/schemas/sokwedb/indexes/create/locations_gps.m4 rename to db/schemas/sokwedb/indexes/create/locations_utm.m4 index a3e4584..61cc797 100644 --- a/db/schemas/sokwedb/indexes/create/locations_gps.m4 +++ b/db/schemas/sokwedb/indexes/create/locations_utm.m4 @@ -22,11 +22,11 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl -CREATE INDEX IF NOT EXISTS locations_gps_x ON locations_gps +CREATE INDEX IF NOT EXISTS locations_utm_x ON locations_utm (x); -CREATE INDEX IF NOT EXISTS locations_gps_y ON locations_gps +CREATE INDEX IF NOT EXISTS locations_utm_y ON locations_utm (y); -CREATE INDEX IF NOT EXISTS locations_gps_commid ON locations_gps +CREATE INDEX IF NOT EXISTS locations_utm_commid ON locations_utm (commid); -CREATE INDEX IF NOT EXISTS locations_gps_follownum ON locations_gps +CREATE INDEX IF NOT EXISTS locations_utm_follownum ON locations_utm (follownum); diff --git a/db/schemas/sokwedb/indexes/drop/locations_gps.m4 b/db/schemas/sokwedb/indexes/drop/locations_utm.m4 similarity index 84% rename from db/schemas/sokwedb/indexes/drop/locations_gps.m4 rename to db/schemas/sokwedb/indexes/drop/locations_utm.m4 index 5898245..2239043 100644 --- a/db/schemas/sokwedb/indexes/drop/locations_gps.m4 +++ b/db/schemas/sokwedb/indexes/drop/locations_utm.m4 @@ -22,7 +22,7 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl -DROP INDEX IF EXISTS locations_gps_x; -DROP INDEX IF EXISTS locations_gps_y; -DROP INDEX IF EXISTS locations_gps_commid; -DROP INDEX IF EXISTS locations_gps_follownum; +DROP INDEX IF EXISTS locations_utm_x; +DROP INDEX IF EXISTS locations_utm_y; +DROP INDEX IF EXISTS locations_utm_commid; +DROP INDEX IF EXISTS locations_utm_follownum; diff --git a/db/schemas/sokwedb/tables/Makefile b/db/schemas/sokwedb/tables/Makefile index 34857f8..d892e62 100644 --- a/db/schemas/sokwedb/tables/Makefile +++ b/db/schemas/sokwedb/tables/Makefile @@ -44,7 +44,7 @@ ORDER := biography_data \ groom_scans_b \ arrivals_a \ repro_states \ - locations_gps \ + locations_utm \ locations_map \ pantgrunts \ brecord_notes \ diff --git a/db/schemas/sokwedb/tables/create/locations_gps.m4 b/db/schemas/sokwedb/tables/create/locations_utm.m4 similarity index 95% rename from db/schemas/sokwedb/tables/create/locations_gps.m4 rename to db/schemas/sokwedb/tables/create/locations_utm.m4 index 055f787..ccf66ea 100644 --- a/db/schemas/sokwedb/tables/create/locations_gps.m4 +++ b/db/schemas/sokwedb/tables/create/locations_utm.m4 @@ -23,7 +23,7 @@ include(`tablemacros.m4')dnl include(`grants.m4')dnl -CREATE TABLE locations_gps ( +CREATE TABLE locations_utm ( eid INTEGER NOT NULL REFERENCES events ,x INTEGER NOT NULL @@ -59,6 +59,6 @@ CREATE TABLE locations_gps ( REFERENCES people ); -eid_primary_key(`LOCATIONS_GPS') +eid_primary_key(`LOCATIONS_UTM') -grant_priv(`LOCATIONS_GPS') +grant_priv(`LOCATIONS_UTM') diff --git a/doc/diagrams/events.svg b/doc/diagrams/events.svg index f432c2d..45b647a 100644 --- a/doc/diagrams/events.svg +++ b/doc/diagrams/events.svg @@ -3351,7 +3351,7 @@ id="tspan2062-5-7-8" x="40.162823" y="54.840057" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82223px;font-family:Sans;-inkscape-font-specification:'Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583px">LOCATIONS_GPS + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82223px;font-family:Sans;-inkscape-font-specification:'Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583px">LOCATIONS_UTM ` -.. |LOCATIONS_GPS| replace:: :ref:`LOCATIONS_GPS ` -.. |LOCATIONS_GPS.EID| replace:: - :ref:`EID ` -.. |LOCATIONS_GPS.X| replace:: - :ref:`X ` -.. |LOCATIONS_GPS.Y| replace:: - :ref:`Y ` -.. |LOCATIONS_GPS.Elevation| replace:: - :ref:`Elevation ` -.. |LOCATIONS_GPS.CommID| replace:: - :ref:`CommID ` -.. |LOCATIONS_GPS.FollowNum| replace:: - :ref:`FollowNum ` -.. |LOCATIONS_GPS.Origin| replace:: - :ref:`Origin ` -.. |LOCATIONS_GPS.Notes| replace:: - :ref:`Notes ` -.. |LOCATIONS_GPS.Entered| replace:: - :ref:`Entered ` +.. |LOCATIONS_UTM| replace:: :ref:`LOCATIONS_UTM ` +.. |LOCATIONS_UTM.EID| replace:: + :ref:`EID ` +.. |LOCATIONS_UTM.X| replace:: + :ref:`X ` +.. |LOCATIONS_UTM.Y| replace:: + :ref:`Y ` +.. |LOCATIONS_UTM.Elevation| replace:: + :ref:`Elevation ` +.. |LOCATIONS_UTM.CommID| replace:: + :ref:`CommID ` +.. |LOCATIONS_UTM.FollowNum| replace:: + :ref:`FollowNum ` +.. |LOCATIONS_UTM.Origin| replace:: + :ref:`Origin ` +.. |LOCATIONS_UTM.Notes| replace:: + :ref:`Notes ` +.. |LOCATIONS_UTM.Entered| replace:: + :ref:`Entered ` .. |LOCATIONS_MAP| replace:: :ref:`LOCATIONS_MAP ` .. |LOCATIONS_MAP.EID| replace:: diff --git a/doc/src/tables.m4 b/doc/src/tables.m4 index ce128e5..e423f44 100644 --- a/doc/src/tables.m4 +++ b/doc/src/tables.m4 @@ -50,7 +50,7 @@ and are therefore the result of at least a rudimentary analytical process. tables/groom_scans_b.rst tables/groomings.rst tables/humans.rst - tables/locations_gps.rst + tables/locations_utm.rst tables/locations_map.rst tables/matings.rst tables/pantgrunts.rst diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index 0dd9edc..d750af8 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -354,11 +354,11 @@ The following table lists these rules and implications: follow for a given individual on a given day then the EVENTS row must be associated with the follow. - A related row should exist on |LOCATIONS_GPS|; there should be a - row on |LOCATIONS_GPS| with a |LOCATIONS_GPS|.\ |LOCATIONS_GPS.EID| + A related row should exist on |LOCATIONS_UTM|; there should be a + row on |LOCATIONS_UTM| with a |LOCATIONS_UTM|.\ |LOCATIONS_UTM.EID| value of the event's |EVENTS.EID|. - There may be at most one of these related |LOCATIONS_GPS| rows. - The system will generate a warning when there is no |LOCATIONS_GPS| + There may be at most one of these related |LOCATIONS_UTM| rows. + The system will generate a warning when there is no |LOCATIONS_UTM| row related to the event. The |ROLES| row related to the event, the row with a |ROLES|.\ @@ -741,7 +741,7 @@ The following list summarizes the available codes: A row must exist on |BRECORD_NOTES|. ``sdb_utm`` (UTM Location) - A row must exist on |LOCATIONS_GPS|. + A row must exist on |LOCATIONS_UTM|. ``sdb_food`` (Food) A row must exist on |FOOD_EVENTS|. diff --git a/doc/src/tables/locations_gps.m4 b/doc/src/tables/locations_utm.m4 similarity index 78% rename from doc/src/tables/locations_gps.m4 rename to doc/src/tables/locations_utm.m4 index ec76173..55d61f9 100644 --- a/doc/src/tables/locations_gps.m4 +++ b/doc/src/tables/locations_utm.m4 @@ -19,22 +19,22 @@ include(macros.m4)dnl sdb_rst_quotes(`on')dnl sdb_generated_rst()dnl -.. _LOCATIONS_GPS: +.. _LOCATIONS_UTM: -LOCATIONS_GPS (spatial LOCATIONS in UTM coordinates) +LOCATIONS_UTM (spatial LOCATIONS in UTM coordinates) ---------------------------------------------------- -.. |LOCATIONS_GPS_summary| replace:: +.. |LOCATIONS_UTM_summary| replace:: Contains one row for each moment in time the spatial location of an individual was taken, and recorded in UTM coordinates. -|LOCATIONS_GPS_summary| +|LOCATIONS_UTM_summary| The system will generate a warning if the community of the follow related to the location information, or that of the |WATCHES| row that exists to support the location record, is not the comm unity associated with the location record. -This means, if the LOCATIONS_GPS.\ |LOCATIONS_GPS.CommID| is not the +This means, if the LOCATIONS_UTM.\ |LOCATIONS_UTM.CommID| is not the |WATCHES|.\ |WATCHES.CommID| of the related |WATCHES| row. @@ -42,17 +42,17 @@ This means, if the LOCATIONS_GPS.\ |LOCATIONS_GPS.CommID| is not the :depth: 2 -.. _LOCATIONS_GPS.EID: +.. _LOCATIONS_UTM.EID: EID (Event IDentifier) `````````````````````` -.. |LOCATIONS_GPS.EID_summary| replace:: +.. |LOCATIONS_UTM.EID_summary| replace:: The |EVENTS|.\ |EVENTS.EID| identifying the spatial map location event. |idcol| -|LOCATIONS_GPS.EID_summary| +|LOCATIONS_UTM.EID_summary| The related event contains information on the time associated with the location, and the related |WATCHES| row information on the located individual and the date. @@ -60,59 +60,59 @@ individual and the date. |notnull| -.. _LOCATIONS_GPS.X: +.. _LOCATIONS_UTM.X: X (X utm coordinate) ```````````````````` -.. |LOCATIONS_GPS.X_summary| replace:: +.. |LOCATIONS_UTM.X_summary| replace:: The X coordinate of the (UTM WGS84 encoded) location. An integer between ``sdb_min_x_utm`` and ``sdb_max_x_utm``, inclusive. -|LOCATIONS_GPS.X_summary| +|LOCATIONS_UTM.X_summary| |notnull| -.. _LOCATIONS_GPS.Y: +.. _LOCATIONS_UTM.Y: Y (Y utm coordinate) ```````````````````` -.. |LOCATIONS_GPS.Y_summary| replace:: +.. |LOCATIONS_UTM.Y_summary| replace:: The Y coordinate of the (UTM WGS84 encoded) location. An integer between ``sdb_min_y_utm`` and ``sdb_max_y_utm`` inclusive. -|LOCATIONS_GPS.Y_summary| +|LOCATIONS_UTM.Y_summary| |notnull| -.. _LOCATIONS_GPS.Elevation: +.. _LOCATIONS_UTM.Elevation: Elevation ````````` -.. |LOCATIONS_GPS.Elevation_summary| replace:: +.. |LOCATIONS_UTM.Elevation_summary| replace:: The elevation of the location, in meters. An integer between ``sdb_min_elevation_utm`` and ``sdb_max_elevation_utm`` inclusive. -|LOCATIONS_GPS.Elevation_summary| +|LOCATIONS_UTM.Elevation_summary| This value may be |null| when there is no elevation information. -.. _LOCATIONS_GPS.CommID: +.. _LOCATIONS_UTM.CommID: CommID `````` -.. |LOCATIONS_GPS.CommID_summary| replace:: +.. |LOCATIONS_UTM.CommID_summary| replace:: A code for the community the observers associated with the location record; the |COMM_IDS|.\ |COMM_IDS.CommID| of the community. This is not necessarily the community the individual is a member of, although it usually is. -|LOCATIONS_GPS.CommID_summary| +|LOCATIONS_UTM.CommID_summary| .. note:: This is not the canonical source of information on the focal's @@ -142,52 +142,52 @@ CommID |notnull| -.. _LOCATIONS_GPS.FollowNum: +.. _LOCATIONS_UTM.FollowNum: FollowNum ````````` -.. |LOCATIONS_GPS.FollowNum_summary| replace:: +.. |LOCATIONS_UTM.FollowNum_summary| replace:: A text string used for checking. -|LOCATIONS_GPS.FollowNum_summary| +|LOCATIONS_UTM.FollowNum_summary| |notonlyspaces| |notnull| -.. _LOCATIONS_GPS.Origin: +.. _LOCATIONS_UTM.Origin: Origin `````` -.. |LOCATIONS_GPS.Origin_summary| replace:: +.. |LOCATIONS_UTM.Origin_summary| replace:: A code indicating the source of the location information. A |LOCATION_ORIGINS|.\ |LOCATION_ORIGINS.Code| value. -|LOCATIONS_GPS.Origin_summary| +|LOCATIONS_UTM.Origin_summary| |notnull| -.. _LOCATIONS_GPS.Notes: +.. _LOCATIONS_UTM.Notes: Notes ````` -.. |LOCATIONS_GPS.Notes_summary| replace:: +.. |LOCATIONS_UTM.Notes_summary| replace:: Free form textual notes on the individual's spatial placement. -|LOCATIONS_GPS.Notes_summary| |notonlyspaces| |notnull| +|LOCATIONS_UTM.Notes_summary| |notonlyspaces| |notnull| -.. _LOCATIONS_GPS.Entered: +.. _LOCATIONS_UTM.Entered: Entered ``````` -.. |LOCATIONS_GPS.Entered_summary| replace:: +.. |LOCATIONS_UTM.Entered_summary| replace:: The person who recorded the location. A |PEOPLE|.\ |PEOPLE.Person| value. -|LOCATIONS_GPS.Entered_summary| +|LOCATIONS_UTM.Entered_summary| |notnull| -- 2.34.1