Skip to content
Merged
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 backend/src/api-tests/crossSearch/get.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('Getting cross-search data', () => {
const { body: getReqBody } = await send<CrossSearch[]>(`crosssearch/all/999/0/[]/[]`, 'GET')
expect(getReqBody.map(e => e.lid_now_loc)).toContain(24797)
expect(getReqBody.map(e => e.lid_now_loc)).toContain(24750)
expect(getReqBody.map(e => e.loc_name)).toContain('Romanyà dEmpordà')
expect(getReqBody.map(e => e.loc_name)).toContain("Romanyà d'Empordà")
expect(getReqBody.map(e => e.loc_name)).toContain('Goishi')
expect(getReqBody.map(e => e.species_name)).toContain('dubia')
expect(getReqBody.map(e => e.species_name)).toContain('planicephala')
Expand Down
6 changes: 3 additions & 3 deletions test_data/sqlfiles/now_test.sql
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ CREATE TABLE `com_mlist` (
LOCK TABLES `com_mlist` WRITE;
/*!40000 ALTER TABLE `com_mlist` DISABLE KEYS */;
INSERT INTO `com_mlist` VALUES
('IPMC','Institut Català de Paleontologia Miquel Crusafont','','Sabadell','','Catalonia','Spain',NULL,1,NULL),
('IPMC','Institut Català de Paleontologia Miquel Crusafont','','Sabadell','','Catalonia','Spain',NULL,1,NULL),
('ISEZ','Institute of Systematics and Evolution of Animals, Polish Academy of Sciences','Instytut Systematyki i Ewolucji Zwierzat, Polska Akademia Nauk','Cracow',NULL,NULL,'Poland',NULL,1,NULL),
('RGM','Naturalis: National Museum of Natural History','Nationaal Natuurhistorisch Museum, former Rijksmuseum van Geologie en Mineralogie','Leiden','','','Netherlands',NULL,1,NULL);
/*!40000 ALTER TABLE `com_mlist` ENABLE KEYS */;
Expand Down Expand Up @@ -693,7 +693,7 @@ LOCK TABLES `now_loc` WRITE;
INSERT INTO `now_loc` VALUES
(20920,'bahean','bahean','Lantian-Shuijiazui','time_unit',11.63,7.2,NULL,NULL,NULL,NULL,'','','Fenwei','Weihe','34 6 0 N','109 18 0 E',34.1,109.3,NULL,NULL,'China','Shaanxi','Lantian','100-1000m2','y','','','','Bahe','','','',NULL,NULL,'sandstone','','',NULL,NULL,NULL,NULL,NULL,'','','','','','','','','','','','','','','','','','','','','','','','','','','',NULL,NULL,'','y',NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(21050,NULL,'olduvai','Dmanisi','composite',1.85,1.778,'Ar/Ar',NULL,NULL,NULL,'Villafranchian, MNQ18','before Acheulian: E. hydruntinus, stone tools.1.81 Ma based on volcanic ash dating',NULL,NULL,'41 20 10 N','44 20 38 E',41.336111111111116,44.34388888888889,0,NULL,'Georgia','Tbilisi area','','','n','','elevation 1015m','','','','','',NULL,NULL,'sandstone','','',NULL,NULL,NULL,NULL,NULL,'','','','','','','','','','','','','','','','wet','hot','','','','','','','','','','',NULL,NULL,'','',NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(24750,NULL,NULL,'Romanyà dEmpordà','absolute',7.1,5.3,'Ar/Ar','AAR',NULL,NULL,'Turolian',NULL,'Ebro',NULL,'42 9 58 N','2 39 58 E',42.166,2.666,NULL,NULL,'Spain','Province of Girona',NULL,NULL,NULL,NULL,'Empordà Basin.Coordinates are for Girona.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(24750,NULL,NULL,'Romanyà d''Empordà','absolute',7.1,5.3,'Ar/Ar','AAR',NULL,NULL,'Turolian',NULL,'Ebro',NULL,'42 9 58 N','2 39 58 E',42.166,2.666,NULL,NULL,'Spain','Province of Girona',NULL,NULL,NULL,NULL,'Empordà Basin.Coordinates are for Girona.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(24797,'mn5','mn5','Las Umbrias 1','time_unit',16.4,14.2,NULL,NULL,NULL,NULL,'Aragonian, zone Dd','C5Adn','Iberian Range',NULL,'41 11 46 N','1 30 38 W',41.1963254,-1.5106093,NULL,NULL,'Spain','Province of Zaragoza',NULL,NULL,NULL,NULL,'northern Teruel Basin. Coordinates are for Villafeliche',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(28518,'langhian','langhian','Goishi','time_unit',15.97,13.82,NULL,NULL,NULL,NULL,NULL,NULL,'Joban',NULL,'38 12 0 N','140 42 0 E',38.2,140.7,1,NULL,'Japan','Miyagi Prefecture',NULL,NULL,NULL,NULL,NULL,NULL,'Moniwa',NULL,NULL,NULL,NULL,NULL,'sandstone',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(29999,NULL,NULL,'not in cross search','time_unit',15.97,13.82,NULL,NULL,NULL,NULL,NULL,NULL,'Joban',NULL,'38 12 0 N','140 42 0 E',38.2,140.7,1,NULL,'Japan','Miyagi Prefecture',NULL,NULL,NULL,NULL,NULL,NULL,'Moniwa',NULL,NULL,NULL,NULL,NULL,'sandstone',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
Expand Down Expand Up @@ -1640,7 +1640,7 @@ INSERT INTO `now_tu_sequence` VALUES
('oxygenisotopestages','Oxygen Isotope Stages'),
('salma','SALMA'),
('SwissNorthAlpineForelandBa','Swiss North Alpine Foreland Ba'),
('VallsPenedslocalbiozone','Vallès-Penedès local biozone');
('VallsPenedslocalbiozone','Vallès-Penedès local biozone');
/*!40000 ALTER TABLE `now_tu_sequence` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down
Loading