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

Merge v1.34 to master #5855

Merged
merged 27 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0bd57d3
Adding update for #https://ror.org/02p2cc606, per #5761
adambuttrick Oct 4, 2023
bb2b02c
Adding all updates through 2023/10/06
adambuttrick Oct 7, 2023
9acc4fa
Fixing date type errors
adambuttrick Oct 7, 2023
23b7b55
Fixing more date errors
adambuttrick Oct 7, 2023
7351840
Fixing even more date errors!
adambuttrick Oct 7, 2023
0025ef6
Adding all updates though 2023/10/10
adambuttrick Oct 10, 2023
0ff459e
Adding three more updates
adambuttrick Oct 10, 2023
12289fa
Corrections on 02f762h70.json
adambuttrick Oct 10, 2023
e9673e9
Adding update for https://ror.org/01g0b5g28, per #5825
adambuttrick Oct 10, 2023
b7e4376
Adding all new records through 2023/10/10
adambuttrick Oct 11, 2023
b756ce3
Adding updates for #5080
adambuttrick Oct 11, 2023
a5ddd57
Adding relationships file
adambuttrick Oct 11, 2023
21c5866
Apply relationship changes to files
adambuttrick Oct 11, 2023
005364f
Apply relationship changes to files
adambuttrick Oct 11, 2023
444937f
Apply relationship changes to files
adambuttrick Oct 11, 2023
e57bd18
Adding update for https://ror.org/0593xbv16, per #5827
adambuttrick Oct 11, 2023
f962c92
Merge branch 'rc-v1.34' of https://github.com/ror-community/ror-updat…
adambuttrick Oct 11, 2023
2c056af
Adding update for https://ror.org/02rdkx920, per #5828
adambuttrick Oct 11, 2023
c06bd6a
Apply address changes to files
adambuttrick Oct 11, 2023
f16760f
Update 04qbxr381.json
adambuttrick Oct 11, 2023
ec58b53
Update 033mqx355.json
adambuttrick Oct 11, 2023
0bad05b
Update 033mqx355.json
adambuttrick Oct 11, 2023
5c2614a
Fixing relationship errors
adambuttrick Oct 11, 2023
c31ede3
Apply address changes to files
adambuttrick Oct 11, 2023
de05bf8
Revert "Apply address changes to files"
adambuttrick Oct 11, 2023
286c545
Update 02z5nhe81.json
adambuttrick Oct 11, 2023
d63e140
Update 05v14bq57.json
adambuttrick Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
101 changes: 101 additions & 0 deletions rc-v1.34/new/002pscq53.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"ip_addresses": [],
"aliases": [
"NOAA NWS Southern Region",
"National Oceanic and Atmospheric Administration Southern Region",
"National Weather Service Southern Region"
],
"acronyms": [
"NOAA SR",
"NWS SR",
"NOAA NWS SR"
],
"links": [
"https://www.weather.gov/srh/"
],
"country": {
"country_name": "United States",
"country_code": "US"
},
"name": "NOAA National Weather Service Southern Region",
"wikipedia_url": null,
"addresses": [
{
"lat": 32.72541,
"lng": -97.32085,
"state": null,
"state_code": null,
"country_geonames_id": 6252001,
"city": "Fort Worth",
"geonames_city": {
"id": 4691930,
"city": "Fort Worth",
"geonames_admin1": {
"name": "Texas",
"ascii_name": "Texas",
"id": 4736286,
"code": "US.TX"
},
"geonames_admin2": {
"name": "Tarrant",
"id": 4735638,
"ascii_name": "Tarrant",
"code": "US.TX.439"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"types": [
"Government"
],
"external_ids": {
"ISNI": {
"preferred": "0000 0004 0418 0790",
"all": [
"0000 0004 0418 0790"
]
},
"Wikidata": {
"preferred": "Q122538391",
"all": [
"Q122538391"
]
}
},
"established": null,
"relationships": [
{
"label": "NOAA Office of Chief Operating Officer",
"type": "Parent",
"id": "https://ror.org/01fmhrb91"
},
{
"label": "NOAA National Weather Service",
"type": "Parent",
"id": "https://ror.org/00tgqzw13"
}
],
"email_address": null,
"id": "https://ror.org/002pscq53",
"labels": [],
"status": "active"
}
94 changes: 94 additions & 0 deletions rc-v1.34/new/002shdh75.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"ip_addresses": [],
"aliases": [
"National Oceanic and Atmospheric Administration National Marine Fisheries Service Office of Habitat Conservation",
"NOAA NMFS Office of Habitat Conservation",
"United States National Marine Fisheries Service Office of Habitat Conservation",
"U.S. National Marine Fisheries Service Office of Habitat Conservation",
"NMFS Office of Habitat Conservation",
"Office of Habitat Conservation"
],
"acronyms": [
"OHC",
"NMFS OHC",
"NOAA OHC",
"NOAA NMFS OHC"
],
"links": [
"https://www.fisheries.noaa.gov/about/office-habitat-conservation"
],
"country": {
"country_name": "United States",
"country_code": "US"
},
"name": "NOAA Office of Habitat Conservation",
"wikipedia_url": null,
"addresses": [
{
"lat": 38.99067,
"lng": -77.02609,
"state": null,
"state_code": null,
"country_geonames_id": 6252001,
"city": "Silver Spring",
"geonames_city": {
"id": 4369596,
"city": "Silver Spring",
"geonames_admin1": {
"name": "Maryland",
"ascii_name": "Maryland",
"id": 4361885,
"code": "US.MD"
},
"geonames_admin2": {
"name": "Montgomery",
"id": 4362716,
"ascii_name": "Montgomery",
"code": "US.MD.031"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"types": [
"Government"
],
"external_ids": {
"Wikidata": {
"preferred": "Q51525007",
"all": [
"Q51525007"
]
}
},
"established": null,
"relationships": [
{
"label": "NOAA National Marine Fisheries Service",
"type": "Parent",
"id": "https://ror.org/033mqx355"
}
],
"email_address": null,
"id": "https://ror.org/002shdh75",
"labels": [],
"status": "active"
}
92 changes: 92 additions & 0 deletions rc-v1.34/new/0046t1019.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"ip_addresses": [],
"aliases": [],
"acronyms": [],
"links": [
"https://www.eskenazihealth.edu"
],
"country": {
"country_name": "United States",
"country_code": "US"
},
"name": "Eskenazi Health",
"wikipedia_url": null,
"addresses": [
{
"lat": 39.76838,
"lng": -86.15804,
"state": null,
"state_code": null,
"country_geonames_id": 6252001,
"city": "Indianapolis",
"geonames_city": {
"id": 4259418,
"city": "Indianapolis",
"geonames_admin1": {
"name": "Indiana",
"ascii_name": "Indiana",
"id": 4921868,
"code": "US.IN"
},
"geonames_admin2": {
"name": "Marion",
"id": 4260977,
"ascii_name": "Marion",
"code": "US.IN.097"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"types": [
"Healthcare"
],
"external_ids": {
"ISNI": {
"preferred": "0000 0004 4910 3721",
"all": [
"0000 0004 4910 3721"
]
}
},
"established": null,
"relationships": [
{
"label": "Eskenazi Health Foundation",
"type": "Parent",
"id": "https://ror.org/0391w8d97"
},
{
"label": "Sidney & Lois Eskenazi Hospital",
"type": "Child",
"id": "https://ror.org/02fj1x097"
},
{
"label": "Health & Hospital Corporation of Marion County",
"type": "Parent",
"id": "https://ror.org/02yjy0144"
}
],
"email_address": null,
"id": "https://ror.org/0046t1019",
"labels": [],
"status": "active"
}
80 changes: 80 additions & 0 deletions rc-v1.34/new/005sm0w71.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"ip_addresses": [],
"aliases": [
"National Oceanic and Atmospheric Administration Geostationary Extended Observations",
"Geostationary Extended Observations",
"GeoXO",
"NOAA GeoXO"
],
"acronyms": [],
"links": [
"https://www.nesdis.noaa.gov/about/our-offices/goes-r-and-geoxo-programs"
],
"country": {
"country_name": "United States",
"country_code": "US"
},
"name": "NOAA Geostationary Extended Observations",
"wikipedia_url": "https://en.wikipedia.org/wiki/Geostationary_Extended_Observations",
"addresses": [
{
"lat": 39.00455,
"lng": -76.87553,
"state": null,
"state_code": null,
"country_geonames_id": 6252001,
"city": "Greenbelt",
"geonames_city": {
"id": 4356847,
"city": "Greenbelt",
"geonames_admin1": {
"name": "Maryland",
"ascii_name": "Maryland",
"id": 4361885,
"code": "US.MD"
},
"geonames_admin2": {
"name": "Prince George's",
"id": 4366164,
"ascii_name": "Prince George's",
"code": "US.MD.033"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
}
},
"primary": false,
"postcode": null,
"line": null
}
],
"types": [
"Government"
],
"external_ids": {},
"established": null,
"relationships": [
{
"label": "NOAA National Environmental Satellite Data and Information Service",
"type": "Parent",
"id": "https://ror.org/007qwym43"
}
],
"email_address": null,
"id": "https://ror.org/005sm0w71",
"labels": [],
"status": "active"
}
Loading
Loading