Merge pull request #222 from UW-Macrostrat/maps

added lines and points mapping for gems pipeline

Author: amyfromandi

cli/macrostrat/cli/commands/export.py

@@ -181,7 +181,7 @@ def write_sources(self, filename, sources):
                 ref_source,
                 isbn_doi,
                 scale,
-                licence AS license
+                license AS license
             FROM maps.sources
             WHERE source_id = ANY(%(source_ids)s)
         """,
@@ -540,7 +540,7 @@ def run(self):
                     ref_source,
                     isbn_doi,
                     scale,
-                    licence AS license
+                    license
                 FROM maps.sources
                 WHERE source_id IN (
                     SELECT DISTINCT ll.source_id

cli/macrostrat/cli/database/migrations/baseline/00-baseline.sql

@@ -345,7 +345,7 @@ CREATE TABLE geologic_boundaries.sources (
     isbn_doi character varying(100),
     scale character varying(20),
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean,
@@ -1224,8 +1224,11 @@ CREATE TABLE maps.sources (
     ref_source character varying(255),
     isbn_doi character varying(100),
     scale character varying(20),
+    keywords text[],
+    language text,
+    description varchar,
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean DEFAULT false,
@@ -1238,6 +1241,7 @@ CREATE TABLE maps.sources (
     ingested_by text
 );
 
+
 CREATE SEQUENCE maps.sources_source_id_seq
     START WITH 1
     INCREMENT BY 1

cli/macrostrat/cli/database/migrations/legacy_baseline/00-baseline.sql

@@ -741,7 +741,7 @@ CREATE TABLE geologic_boundaries.sources (
     isbn_doi character varying(100),
     scale character varying(20),
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean,
@@ -2298,8 +2298,11 @@ CREATE TABLE maps.sources (
     ref_source character varying(255),
     isbn_doi character varying(100),
     scale character varying(20),
+    keywords text[],
+    language text,
+    description varchar,
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean DEFAULT false,

cli/macrostrat/cli/database/migrations/maps_sources_api/01-maps-sources.sql

@@ -14,7 +14,7 @@ SELECT
     ref_source,
     isbn_doi,
     scale,
-    licence,
+    license,
     features,
     area,
     display_scales,
@@ -47,7 +47,7 @@ SELECT
     s.ref_source,
     s.isbn_doi,
     s.scale,
-    s.licence,
+    s.license,
     s.features,
     s.area,
     s.display_scales,
@@ -76,7 +76,7 @@ SELECT
     s.ref_year,
     s.ref_source,
     s.isbn_doi,
-    s.licence,
+    s.license,
     s.scale,
     s.features,
     s.area,

core/macrostrat/core/schemas.py

@@ -42,7 +42,7 @@ class Sources(Base):
     isbn_doi: Mapped[str] = mapped_column(VARCHAR(100))
     scale: Mapped[str] = mapped_column(VARCHAR(20))
     primary_line_table: Mapped[str] = mapped_column(VARCHAR(50))
-    licence: Mapped[str] = mapped_column(VARCHAR(100))
+    license: Mapped[str] = mapped_column(VARCHAR(100))
     features: Mapped[int] = mapped_column(INTEGER)
     area: Mapped[int] = mapped_column(INTEGER)
     priority: Mapped[bool] = mapped_column(BOOLEAN)

map-integration/__archive/setup/schema.sql

@@ -94,7 +94,7 @@ CREATE TABLE sources (
     isbn_doi character varying(100),
     scale character varying(20),
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean DEFAULT false,
@@ -140,7 +140,7 @@ CREATE TABLE sources (
     isbn_doi character varying(100),
     scale character varying(20),
     primary_line_table character varying(50),
-    licence character varying(100),
+    license character varying(100),
     features integer,
     area integer,
     priority boolean,

map-integration/__archive/utils/move_source.js

@@ -252,7 +252,7 @@ function exportSource(db, source_id, callback) {
 
     var targetTables = {
       'maps.sources': buildDumpStatement(db, meta, 'maps.sources', `
-        SELECT source_id, name, primary_table, url, ref_title, authors, ref_year, ref_source, isbn_doi, scale, primary_line_table, licence, features, area, priority, rgeom
+        SELECT source_id, name, primary_table, url, ref_title, authors, ref_year, ref_source, isbn_doi, scale, primary_line_table, license, features, area, priority, rgeom
         FROM maps.sources
         WHERE source_id = ${meta.source_id}`),
       'maps.map_liths': buildDumpStatement(db, meta, 'maps.map_liths', `