From 1263bffa2d0ba9a9912ef16ba7784964b4e965d8 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Sat, 4 Jul 2026 18:59:54 +0000 Subject: [PATCH] Rename LOCATIONS_GPS -> LOCATIONS_PAPER --- db/schemas/sokwedb/indexes/Makefile | 4 +- .../{locations_map.m4 => locations_paper.m4} | 6 +- .../{locations_map.m4 => locations_paper.m4} | 6 +- db/schemas/sokwedb/tables/Makefile | 2 +- .../{locations_map.m4 => locations_paper.m4} | 6 +- doc/diagrams/events.svg | 2 +- doc/src/epilog.inc.m4 | 34 +++++------ doc/src/tables.m4 | 2 +- doc/src/tables/colobus.m4 | 2 +- doc/src/tables/events.m4 | 10 ++-- .../{locations_map.m4 => locations_paper.m4} | 60 +++++++++---------- 11 files changed, 67 insertions(+), 67 deletions(-) rename db/schemas/sokwedb/indexes/create/{locations_map.m4 => locations_paper.m4} (82%) rename db/schemas/sokwedb/indexes/drop/{locations_map.m4 => locations_paper.m4} (87%) rename db/schemas/sokwedb/tables/create/{locations_map.m4 => locations_paper.m4} (93%) rename doc/src/tables/{locations_map.m4 => locations_paper.m4} (76%) diff --git a/db/schemas/sokwedb/indexes/Makefile b/db/schemas/sokwedb/indexes/Makefile index ebf1fa3..9bcc876 100644 --- a/db/schemas/sokwedb/indexes/Makefile +++ b/db/schemas/sokwedb/indexes/Makefile @@ -23,8 +23,8 @@ 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_utm locations_map \ - colobus matings + arrivals_a species_present repro_states locations_utm \ + locations_paper colobus matings ## ## CAUTION: This Makefile is not designed to be run directly. It is normally diff --git a/db/schemas/sokwedb/indexes/create/locations_map.m4 b/db/schemas/sokwedb/indexes/create/locations_paper.m4 similarity index 82% rename from db/schemas/sokwedb/indexes/create/locations_map.m4 rename to db/schemas/sokwedb/indexes/create/locations_paper.m4 index c642f26..b33647c 100644 --- a/db/schemas/sokwedb/indexes/create/locations_map.m4 +++ b/db/schemas/sokwedb/indexes/create/locations_paper.m4 @@ -22,9 +22,9 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl -CREATE INDEX IF NOT EXISTS locations_map_mapseq ON locations_map +CREATE INDEX IF NOT EXISTS locations_paper_mapseq ON locations_paper (mapseq); -CREATE INDEX IF NOT EXISTS locations_map_commid ON locations_map +CREATE INDEX IF NOT EXISTS locations_paper_commid ON locations_paper (commid); -CREATE INDEX IF NOT EXISTS locations_map_follownum ON locations_map +CREATE INDEX IF NOT EXISTS locations_paper_follownum ON locations_paper (follownum); diff --git a/db/schemas/sokwedb/indexes/drop/locations_map.m4 b/db/schemas/sokwedb/indexes/drop/locations_paper.m4 similarity index 87% rename from db/schemas/sokwedb/indexes/drop/locations_map.m4 rename to db/schemas/sokwedb/indexes/drop/locations_paper.m4 index 426bbc6..9296e47 100644 --- a/db/schemas/sokwedb/indexes/drop/locations_map.m4 +++ b/db/schemas/sokwedb/indexes/drop/locations_paper.m4 @@ -22,6 +22,6 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl -DROP INDEX IF EXISTS locations_map_mapseq; -DROP INDEX IF EXISTS locations_map_commid; -DROP INDEX IF EXISTS locations_map_follownum; +DROP INDEX IF EXISTS locations_paper_mapseq; +DROP INDEX IF EXISTS locations_paper_commid; +DROP INDEX IF EXISTS locations_paper_follownum; diff --git a/db/schemas/sokwedb/tables/Makefile b/db/schemas/sokwedb/tables/Makefile index d892e62..0c6ec67 100644 --- a/db/schemas/sokwedb/tables/Makefile +++ b/db/schemas/sokwedb/tables/Makefile @@ -45,7 +45,7 @@ ORDER := biography_data \ arrivals_a \ repro_states \ locations_utm \ - locations_map \ + locations_paper \ pantgrunts \ brecord_notes \ colobus \ diff --git a/db/schemas/sokwedb/tables/create/locations_map.m4 b/db/schemas/sokwedb/tables/create/locations_paper.m4 similarity index 93% rename from db/schemas/sokwedb/tables/create/locations_map.m4 rename to db/schemas/sokwedb/tables/create/locations_paper.m4 index 616a7cd..6f5e205 100644 --- a/db/schemas/sokwedb/tables/create/locations_map.m4 +++ b/db/schemas/sokwedb/tables/create/locations_paper.m4 @@ -23,7 +23,7 @@ include(`tablemacros.m4')dnl include(`grants.m4')dnl -CREATE TABLE locations_map ( +CREATE TABLE locations_paper ( eid INTEGER NOT NULL REFERENCES events ,mapseq INTEGER NOT NULL @@ -41,6 +41,6 @@ CREATE TABLE locations_map ( REFERENCES people ); -eid_primary_key(`LOCATIONS_MAP') +eid_primary_key(`LOCATIONS_PAPER') -grant_priv(`LOCATIONS_MAP') +grant_priv(`LOCATIONS_PAPER') diff --git a/doc/diagrams/events.svg b/doc/diagrams/events.svg index 45b647a..3cbf9ef 100644 --- a/doc/diagrams/events.svg +++ b/doc/diagrams/events.svg @@ -3559,7 +3559,7 @@ id="tspan2062-5-7-8-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_MAP + 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_PAPER ` -.. |LOCATIONS_MAP| replace:: :ref:`LOCATIONS_MAP ` -.. |LOCATIONS_MAP.EID| replace:: - :ref:`EID ` -.. |LOCATIONS_MAP.MapSeq| replace:: - :ref:`MapSeq ` -.. |LOCATIONS_MAP.MetersToNextMapSeq| replace:: - :ref:`MetersToNextMapSeq ` -.. |LOCATIONS_MAP.CommID| replace:: - :ref:`CommID ` -.. |LOCATIONS_MAP.FollowNum| replace:: - :ref:`FollowNum ` -.. |LOCATIONS_MAP.Origin| replace:: - :ref:`Origin ` -.. |LOCATIONS_MAP.Notes| replace:: - :ref:`Notes ` -.. |LOCATIONS_MAP.Entered| replace:: - :ref:`Entered ` +.. |LOCATIONS_PAPER| replace:: :ref:`LOCATIONS_PAPER ` +.. |LOCATIONS_PAPER.EID| replace:: + :ref:`EID ` +.. |LOCATIONS_PAPER.MapSeq| replace:: + :ref:`MapSeq ` +.. |LOCATIONS_PAPER.MetersToNextMapSeq| replace:: + :ref:`MetersToNextMapSeq ` +.. |LOCATIONS_PAPER.CommID| replace:: + :ref:`CommID ` +.. |LOCATIONS_PAPER.FollowNum| replace:: + :ref:`FollowNum ` +.. |LOCATIONS_PAPER.Origin| replace:: + :ref:`Origin ` +.. |LOCATIONS_PAPER.Notes| replace:: + :ref:`Notes ` +.. |LOCATIONS_PAPER.Entered| replace:: + :ref:`Entered ` .. |LOCATION_ORIGINS| replace:: :ref:`LOCATION_ORIGINS ` diff --git a/doc/src/tables.m4 b/doc/src/tables.m4 index e423f44..7a51ac9 100644 --- a/doc/src/tables.m4 +++ b/doc/src/tables.m4 @@ -51,7 +51,7 @@ and are therefore the result of at least a rudimentary analytical process. tables/groomings.rst tables/humans.rst tables/locations_utm.rst - tables/locations_map.rst + tables/locations_paper.rst tables/matings.rst tables/pantgrunts.rst tables/roles.rst diff --git a/doc/src/tables/colobus.m4 b/doc/src/tables/colobus.m4 index f2fa99c..cf20a4e 100644 --- a/doc/src/tables/colobus.m4 +++ b/doc/src/tables/colobus.m4 @@ -109,7 +109,7 @@ by 7 minutes or less. Otherwise rounding is up. The goal is to have a time which corresponds to the location times of -the |LOCATIONS_MAP| rows. [#f1]_ +the |LOCATIONS_PAPER| rows. [#f1]_ In some cases, changes were made based on notes. |notnull| diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index d750af8..2ec951b 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -515,11 +515,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_MAP|; there should be a - row on |LOCATIONS_MAP| with a |LOCATIONS_MAP|.\ |LOCATIONS_MAP.EID| + A related row should exist on |LOCATIONS_PAPER|; there should be a + row on |LOCATIONS_PAPER| with a |LOCATIONS_PAPER|.\ |LOCATIONS_PAPER.EID| value of the event's |EVENTS.EID|. - There may be at most one of these related |LOCATIONS_MAP| rows. - The system will generate a warning when there is no |LOCATIONS_MAP| + There may be at most one of these related |LOCATIONS_PAPER| rows. + The system will generate a warning when there is no |LOCATIONS_PAPER| row related to the event. The |ROLES| row related to the event, the row with a |ROLES|.\ @@ -756,7 +756,7 @@ The following list summarizes the available codes: A row must exist on |MATINGS|. ``sdb_paper`` (PAPER map location) - A row must exist on |LOCATIONS_MAP|. + A row must exist on |LOCATIONS_PAPER|. ``sdb_other_species`` (Other Species) A row must exist on |SPECIES_PRESENT| and/or on |HUMANS|. diff --git a/doc/src/tables/locations_map.m4 b/doc/src/tables/locations_paper.m4 similarity index 76% rename from doc/src/tables/locations_map.m4 rename to doc/src/tables/locations_paper.m4 index d2aae37..416d60b 100644 --- a/doc/src/tables/locations_map.m4 +++ b/doc/src/tables/locations_paper.m4 @@ -19,39 +19,39 @@ include(macros.m4)dnl sdb_rst_quotes(`on')dnl sdb_generated_rst()dnl -.. _LOCATIONS_MAP: +.. _LOCATIONS_PAPER: -LOCATIONS_MAP (spatial LOCATIONS in map numbers) ------------------------------------------------- +LOCATIONS_PAPER (spatial LOCATIONS in map numbers) +-------------------------------------------------- -.. |LOCATIONS_MAP_summary| replace:: +.. |LOCATIONS_PAPER_summary| replace:: Contains one row for each moment in time the spatial location of an individual was taken, and recorded as a map sequence number. -|LOCATIONS_MAP_summary| +|LOCATIONS_PAPER_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 community associated with the location record. -This means, if the LOCATIONS_MAP.\ |LOCATIONS_MAP.CommID| is not the +This means, if the LOCATIONS_PAPER.\ |LOCATIONS_PAPER.CommID| is not the |WATCHES|.\ |WATCHES.CommID| of the related |WATCHES| row. .. contents:: :depth: 2 -.. _LOCATIONS_MAP.EID: +.. _LOCATIONS_PAPER.EID: EID (Event IDentifier) `````````````````````` -.. |LOCATIONS_MAP.EID_summary| replace:: +.. |LOCATIONS_PAPER.EID_summary| replace:: The |EVENTS|.\ |EVENTS.EID| identifying the spatial map location event. |idcol| -|LOCATIONS_MAP.EID_summary| +|LOCATIONS_PAPER.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. @@ -59,48 +59,48 @@ individual and the date. |notnull| -.. _LOCATIONS_MAP.MapSeq: +.. _LOCATIONS_PAPER.MapSeq: MapSeq `````` -.. |LOCATIONS_MAP.MapSeq_summary| replace:: +.. |LOCATIONS_PAPER.MapSeq_summary| replace:: The number of the map where the individual was located, where maps are numbered sequentially within the series of maps traversed during the follow. -|LOCATIONS_MAP.MapSeq_summary| +|LOCATIONS_PAPER.MapSeq_summary| |notnull| -.. _LOCATIONS_MAP.MetersToNextMapSeq: +.. _LOCATIONS_PAPER.MetersToNextMapSeq: MetersToNextMapSeq `````````````````` -.. |LOCATIONS_MAP.MetersToNextMapSeq_summary| replace:: +.. |LOCATIONS_PAPER.MetersToNextMapSeq_summary| replace:: The number of meters to the next map sequence number. -|LOCATIONS_MAP.MetersToNextMapSeq_summary| +|LOCATIONS_PAPER.MetersToNextMapSeq_summary| This number was calculated in various ways over time. |nonnegative| |notnull| -.. _LOCATIONS_MAP.CommID: +.. _LOCATIONS_PAPER.CommID: CommID `````` -.. |LOCATIONS_MAP.CommID_summary| replace:: +.. |LOCATIONS_PAPER.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_MAP.CommID_summary| +|LOCATIONS_PAPER.CommID_summary| .. note:: This is not the canonical source of information on the focal's @@ -130,52 +130,52 @@ CommID |notnull| -.. _LOCATIONS_MAP.FollowNum: +.. _LOCATIONS_PAPER.FollowNum: FollowNum ````````` -.. |LOCATIONS_MAP.FollowNum_summary| replace:: +.. |LOCATIONS_PAPER.FollowNum_summary| replace:: A text string used for checking. -|LOCATIONS_MAP.FollowNum_summary| +|LOCATIONS_PAPER.FollowNum_summary| |notonlyspaces| |notnull| -.. _LOCATIONS_MAP.Origin: +.. _LOCATIONS_PAPER.Origin: Origin `````` -.. |LOCATIONS_MAP.Origin_summary| replace:: +.. |LOCATIONS_PAPER.Origin_summary| replace:: A code indicating the source of the location information. A |LOCATION_ORIGINS|.\ |LOCATION_ORIGINS.Code| value. -|LOCATIONS_MAP.Origin_summary| +|LOCATIONS_PAPER.Origin_summary| |notnull| -.. _LOCATIONS_MAP.Notes: +.. _LOCATIONS_PAPER.Notes: Notes ````` -.. |LOCATIONS_MAP.Notes_summary| replace:: +.. |LOCATIONS_PAPER.Notes_summary| replace:: Free form textual notes on the individual's spatial placement. -|LOCATIONS_MAP.Notes_summary| |notonlyspaces| |notnull| +|LOCATIONS_PAPER.Notes_summary| |notonlyspaces| |notnull| -.. _LOCATIONS_MAP.Entered: +.. _LOCATIONS_PAPER.Entered: Entered ``````` -.. |LOCATIONS_MAP.Entered_summary| replace:: +.. |LOCATIONS_PAPER.Entered_summary| replace:: The person who recorded the location. A |PEOPLE|.\ |PEOPLE.Person| value. -|LOCATIONS_MAP.Entered_summary| +|LOCATIONS_PAPER.Entered_summary| |notnull| -- 2.34.1