diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml
index 34f888acec4..a2b34dbd71e 100644
--- a/conf/solr/schema.xml
+++ b/conf/solr/schema.xml
@@ -286,6 +286,8 @@
+
+
@@ -315,6 +317,7 @@
+
@@ -327,7 +330,12 @@
+
+
+
+
+
@@ -342,6 +350,8 @@
+
+
@@ -357,8 +367,10 @@
+
+
@@ -366,6 +378,7 @@
+
@@ -374,6 +387,7 @@
+
@@ -381,13 +395,22 @@
+
+
+
+
+
+
+
+
+
@@ -401,8 +424,14 @@
+
+
+
+
+
+
@@ -543,6 +572,8 @@
+
+
@@ -572,6 +603,7 @@
+
@@ -584,7 +616,12 @@
+
+
+
+
+
@@ -599,6 +636,8 @@
+
+
@@ -614,8 +653,10 @@
+
+
@@ -623,6 +664,7 @@
+
@@ -631,6 +673,7 @@
+
@@ -638,13 +681,22 @@
+
+
+
+
+
+
+
+
+
@@ -658,7 +710,13 @@
+
+
+
+
+
+
diff --git a/doc/release-notes/10398-geospatial-block.md b/doc/release-notes/10398-geospatial-block.md
new file mode 100644
index 00000000000..50b71d1551e
--- /dev/null
+++ b/doc/release-notes/10398-geospatial-block.md
@@ -0,0 +1,8 @@
+### Update geospatial metadata block in existing installation (PR #11507)
+
+.. code-block:: javascript
+
+ curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file geospatial.tsv
+ curl "http://localhost:8080/api/admin/index/solr/schema" > new.xml
+ ./dataverse/conf/solr/update-fields.sh /usr/local/solr/solr-9.8.0/server/solr/collection1/conf/schema.xml new.xml
+ curl "http://localhost:8983/solr/admin/cores?action=RELOAD&core=collection1"
diff --git a/scripts/api/data/metadatablocks/geospatial.tsv b/scripts/api/data/metadatablocks/geospatial.tsv
index 11408317410..66b7d67d2c8 100644
--- a/scripts/api/data/metadatablocks/geospatial.tsv
+++ b/scripts/api/data/metadatablocks/geospatial.tsv
@@ -1,264 +1,333 @@
-#metadataBlock name dataverseAlias displayName
- geospatial Geospatial Metadata
-#datasetField name title description watermark fieldType displayOrder displayFormat advancedSearchField allowControlledVocabulary allowmultiples facetable displayoncreate required parent metadatablock_id
- geographicCoverage Geographic Coverage Information on the geographic coverage of the data. Includes the total geographic scope of the data. none 0 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
- country Country / Nation The country or nation that the Dataset is about. text 1 #VALUE, TRUE TRUE FALSE TRUE FALSE FALSE geographicCoverage geospatial
- state State / Province The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations. text 2 #VALUE, TRUE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
- city City The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations. text 3 #VALUE, TRUE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
- otherGeographicCoverage Other Other information on the geographic coverage of the data. text 4 #VALUE, FALSE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
- geographicUnit Geographic Unit Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region. text 5 TRUE FALSE TRUE TRUE FALSE FALSE geospatial
- geographicBoundingBox Geographic Bounding Box The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included. none 6 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
- westLongitude Westernmost (Left) Longitude Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -180.0 <= West Bounding Longitude Value <= 180.0. text 7 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
- eastLongitude Easternmost (Right) Longitude Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -180.0 <= East Bounding Longitude Value <= 180.0. text 8 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
- northLatitude Northernmost (Top) Latitude Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -90.0 <= North Bounding Latitude Value <= 90.0. text 9 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
- southLatitude Southernmost (Bottom) Latitude Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -90.0 <= South Bounding Latitude Value <= 90.0. text 10 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
-#controlledVocabulary DatasetField Value identifier displayOrder
- country Afghanistan 0
- country Albania 1
- country Algeria 2
- country American Samoa 3
- country Andorra 4
- country Angola 5
- country Anguilla 6
- country Antarctica 7
- country Antigua and Barbuda 8
- country Argentina 9
- country Armenia 10
- country Aruba 11
- country Australia 12
- country Austria 13
- country Azerbaijan 14
- country Bahamas 15
- country Bahrain 16
- country Bangladesh 17
- country Barbados 18
- country Belarus 19
- country Belgium 20
- country Belize 21
- country Benin 22
- country Bermuda 23
- country Bhutan 24
- country Bolivia, Plurinational State of 25
- country Bonaire, Sint Eustatius and Saba 26
- country Bosnia and Herzegovina 27
- country Botswana 28 BOTSWANA
- country Bouvet Island 29
- country Brazil 30 Brasil
- country British Indian Ocean Territory 31
- country Brunei Darussalam 32
- country Bulgaria 33
- country Burkina Faso 34
- country Burundi 35
- country Cambodia 36
- country Cameroon 37
- country Canada 38
- country Cape Verde 39
- country Cayman Islands 40
- country Central African Republic 41
- country Chad 42
- country Chile 43
- country China 44
- country Christmas Island 45
- country Cocos (Keeling) Islands 46
- country Colombia 47
- country Comoros 48
- country Congo 49
- country Congo, the Democratic Republic of the 50
- country Cook Islands 51
- country Costa Rica 52
- country Croatia 53
- country Cuba 54
- country Curaçao 55
- country Cyprus 56
- country Czech Republic 57
- country Côte d'Ivoire 58
- country Denmark 59
- country Djibouti 60
- country Dominica 61
- country Dominican Republic 62
- country Ecuador 63
- country Egypt 64
- country El Salvador 65
- country Equatorial Guinea 66
- country Eritrea 67
- country Estonia 68
- country Ethiopia 69
- country Falkland Islands (Malvinas) 70
- country Faroe Islands 71
- country Fiji 72
- country Finland 73
- country France 74
- country French Guiana 75
- country French Polynesia 76
- country French Southern Territories 77
- country Gabon 78
- country Gambia 79 Gambia, The
- country Georgia 80
- country Germany 81 Germany (Federal Republic of)
- country Ghana 82 GHANA
- country Gibraltar 83
- country Greece 84
- country Greenland 85
- country Grenada 86
- country Guadeloupe 87
- country Guam 88
- country Guatemala 89
- country Guernsey 90
- country Guinea 91
- country Guinea-Bissau 92
- country Guyana 93
- country Haiti 94
- country Heard Island and Mcdonald Islands 95
- country Holy See (Vatican City State) 96
- country Honduras 97
- country Hong Kong 98
- country Hungary 99
- country Iceland 100
- country India 101 INDIA
- country Indonesia 102 Sumatra
- country Iran, Islamic Republic of 103 Iran Iran (Islamic Republic of)
- country Iraq 104 IRAQ
- country Ireland 105
- country Isle of Man 106
- country Israel 107
- country Italy 108
- country Jamaica 109
- country Japan 110
- country Jersey 111
- country Jordan 112
- country Kazakhstan 113
- country Kenya 114
- country Kiribati 115
- country Korea, Democratic People's Republic of 116
- country Korea, Republic of 117
- country Kuwait 118
- country Kyrgyzstan 119
- country Lao People's Democratic Republic 120 Laos
- country Latvia 121
- country Lebanon 122
- country Lesotho 123 LESOTHO
- country Liberia 124
- country Libya 125
- country Liechtenstein 126
- country Lithuania 127
- country Luxembourg 128
- country Macao 129
- country Macedonia, the Former Yugoslav Republic of 130
- country Madagascar 131
- country Malawi 132
- country Malaysia 133
- country Maldives 134
- country Mali 135
- country Malta 136
- country Marshall Islands 137
- country Martinique 138
- country Mauritania 139
- country Mauritius 140
- country Mayotte 141
- country Mexico 142
- country Micronesia, Federated States of 143
- country Moldova, Republic of 144
- country Monaco 145
- country Mongolia 146
- country Montenegro 147
- country Montserrat 148
- country Morocco 149
- country Mozambique 150 MOZAMBIQUE
- country Myanmar 151
- country Namibia 152 NAMIBIA
- country Nauru 153
- country Nepal 154
- country Netherlands 155
- country New Caledonia 156
- country New Zealand 157
- country Nicaragua 158
- country Niger 159
- country Nigeria 160
- country Niue 161
- country Norfolk Island 162
- country Northern Mariana Islands 163
- country Norway 164
- country Oman 165
- country Pakistan 166
- country Palau 167
- country Palestine, State of 168
- country Panama 169
- country Papua New Guinea 170
- country Paraguay 171
- country Peru 172
- country Philippines 173
- country Pitcairn 174
- country Poland 175
- country Portugal 176
- country Puerto Rico 177
- country Qatar 178
- country Romania 179
- country Russian Federation 180
- country Rwanda 181
- country Réunion 182
- country Saint Barthélemy 183
- country Saint Helena, Ascension and Tristan da Cunha 184
- country Saint Kitts and Nevis 185
- country Saint Lucia 186
- country Saint Martin (French part) 187
- country Saint Pierre and Miquelon 188
- country Saint Vincent and the Grenadines 189
- country Samoa 190
- country San Marino 191
- country Sao Tome and Principe 192
- country Saudi Arabia 193
- country Senegal 194
- country Serbia 195
- country Seychelles 196
- country Sierra Leone 197
- country Singapore 198
- country Sint Maarten (Dutch part) 199
- country Slovakia 200
- country Slovenia 201
- country Solomon Islands 202
- country Somalia 203
- country South Africa 204
- country South Georgia and the South Sandwich Islands 205
- country South Sudan 206
- country Spain 207
- country Sri Lanka 208
- country Sudan 209
- country Suriname 210
- country Svalbard and Jan Mayen 211
- country Swaziland 212 SWAZILAND
- country Sweden 213
- country Switzerland 214
- country Syrian Arab Republic 215
- country Taiwan, Province of China 216 Taiwan
- country Tajikistan 217
- country Tanzania, United Republic of 218 Tanzania
- country Thailand 219
- country Timor-Leste 220
- country Togo 221
- country Tokelau 222
- country Tonga 223
- country Trinidad and Tobago 224
- country Tunisia 225
- country Turkey 226
- country Turkmenistan 227
- country Turks and Caicos Islands 228
- country Tuvalu 229
- country Uganda 230
- country Ukraine 231
- country United Arab Emirates 232 UAE
- country United Kingdom 233
- country United States 234 U.S.A USA United States of America U.S.A.
- country United States Minor Outlying Islands 235
- country Uruguay 236
- country Uzbekistan 237
- country Vanuatu 238
- country Venezuela, Bolivarian Republic of 239
- country Viet Nam 240
- country Virgin Islands, British 241
- country Virgin Islands, U.S. 242
- country Wallis and Futuna 243
- country Western Sahara 244
- country Yemen 245 YEMEN
- country Zambia 246
- country Zimbabwe 247
- country Åland Islands 248
+#metadataBlock name dataverseAlias displayName
+ geospatial Geospatial Metadata
+#datasetField name title description watermark fieldType display order displayFormat advancedSearchField allowControlledVocabulary allowmultiples facetable displayoncreate required parent metadatablock_id
+ geographicCoverage Geographic Coverage Information on the geographic coverage of the data. Includes the total geographic scope of the data. none 0 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ country Country / Nation The country or nation that the Dataset is about. text 1 #VALUE, TRUE TRUE FALSE TRUE FALSE FALSE geographicCoverage geospatial
+ state State / Province The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations. text 2 #VALUE, TRUE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
+ city City The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations. text 3 #VALUE, TRUE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
+ otherGeographicCoverage Other Other information on the geographic coverage of the data. text 4 #VALUE, FALSE FALSE FALSE TRUE FALSE FALSE geographicCoverage geospatial
+ geographicUnit Geographic Unit Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region. text 5 TRUE FALSE TRUE TRUE FALSE FALSE geospatial
+ geographicBoundingBox Geographic Bounding Box The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included. none 6 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ westLongitude Westernmost (Left) Longitude Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -180.0 <= West Bounding Longitude Value <= 180.0. text 7 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
+ eastLongitude Easternmost (Right) Longitude Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -180.0 <= East Bounding Longitude Value <= 180.0. text 8 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
+ northLatitude Northernmost (Top) Latitude Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -90.0 <= North Bounding Latitude Value <= 90.0. text 9 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
+ southLatitude Southernmost (Bottom) Latitude Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values, expressed in decimal degrees, is -90.0 <= South Bounding Latitude Value <= 90.0. text 10 FALSE FALSE FALSE FALSE FALSE FALSE geographicBoundingBox geospatial
+ referenceSystemInfo Reference System Information Description of the spatial and temporal reference systems used in the resource. none 11 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ referenceSystemCode Reference System Code An alphanumeric identifier for the reference system for this data resource. The reference system provides a framework to define how the bounding box coordinates map to real-world locations. text 12 #VALUE FALSE FALSE FALSE TRUE FALSE FALSE referenceSystemInfo geospatial
+ referenceSystemCodeSpace Reference System Code Space Identifier/ namespace of the system in which the reference system code is valid. E.g. "EPSG" EPSG, WGS, etc. text 13 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE referenceSystemInfo geospatial
+ spatialResolution Spatial Resolution The spatial resolution provides a general understanding of the density of spatial data in the resource, or describes the range of resolutions in which a digital resource may be used. Spatial resolution can be expressed as an equivalent scale (the scale of a comparable hardcopy map or chart), distance (horizontal ground sampling distance), vertical (vertical sampling distance), angularDistance (angular sampling distance), or level of detail (brief textual description of the spatial resolution of the resource). For more information please refer to ISO 19115-1:2014(E), Table B.3.4. NOTE: This element should be repeated when describing upper and lower range. none 14 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ spatialResolutionValue Value The resource's spatial resolution, expressed as an equivalent scale, a distance, an angle, or a brief textual description. text 15 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE spatialResolution geospatial
+ spatialResolutionType Type Format in which the spatial resolution value is expressed (distance, vertical, angularDistance, levelOfDetail). distance, vertical, angularDistance, levelOfDetail text 16 (#VALUE) FALSE TRUE FALSE TRUE FALSE FALSE spatialResolution geospatial
+ spatialResolutionUnitOfMeasure Spatial Resolution Unit of Measure If the spatial resolution value is expressed as a distance, the unit of measure that corresponds to that value (e.g. 'cm', 'm', 'km', etc.) cm', 'm', 'km', etc. text 17 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE spatialResolution geospatial
+ resourceType Type of Geospatial Data Resource The type of geospatial data resource (dataset, service, or series) that is described in this metadata record. text 18 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial
+ referenceDate Resource Reference Date A date which is used to help identify the resource (ISO 19115-3) none 19 TRUE FALSE TRUE FALSE FALSE FALSE geospatial
+ referenceDateValue Date Other date as expressed in yyyy-mm-dd date 20 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE referenceDate geospatial
+ referenceDateType Type The type of date represented in the Date field. revision, expiry, lastUpdate, lastRevision, nextUpdate, unavailable, inForce, adopted, deprecated, superseded, publication text 21 (#VALUE) TRUE TRUE FALSE FALSE FALSE FALSE referenceDate geospatial
+ dataLineageStatement Data Lineage Statement General explanation of the data producer’s knowledge of the dataset lineage. textbox 22 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE geospatial
+ processStep Data Lineage Process Step Description Description of the processes performed on the data, as part of the dataset's lineage or processing history. textbox 23 #VALUE FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ spatialRepresentationType Spatial Representation Type The type of spatial representation refers to the method or structure format that was used to represent geographic information (spatial data) in this dataset. Spatial representation can be as vector, raster (or grid), textTable (textual or tabular data), tin (triangulated irregular network), stereoModel (a 3-D view formed by intersecting homologous rays of an overlapping pair of images), or video (scene from a video recording). For more information about these types please refer to ISO 10115-1:2014(E), Tables B.3.29 and B.7. text 24 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial
+ geometricObjectCount Vector Object Count Vector data only: Total number of geometric objects (curve, composite, complex, point, solid, or surface) in the dataset. int 25 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE geospatial
+ geometricObjectType Vector Object Type Vector data only: The type of geometric objects (or shapes) that make up the structure of the vector dataset. Geometric objects can be used to locate zero, one, two or three dimensional locations on the dataset. Geometric object types can be curve (a bounded, 1-dimensional geometric primitive, representing the continuous image of a line), composite (connected set of curves, solids or surfaces), point (zero-dimensional geometric primitive, representing a position but not having an extent), surface (bounded, connected 2-dimensional geometric primitive, representing the continuous image of a region of a plane), solid (bounded, connected 3-dimensional geometric primitive, representing the continuous image of a region of space), or complex (a set of geometric primitives whose boundaries can be represented as a union of other primitives). For further details about vector geometric obvects, please refer to ISO 10115-1:2014(E), Table B.7. curve, composite, complex, point, solid, or surface text 26 (#VALUE) FALSE TRUE FALSE TRUE FALSE FALSE geospatial
+ numberOfDimensions Raster Dimensions Raster/grid data only: The number of independent spatio-temporal axes, or dimensions, represented in the dataset. For further details about raster data cell geometry, please refer to ISO 19115-1:2014(E), Table B.7. int 27 TRUE FALSE FALSE FALSE FALSE FALSE geospatial
+ axisDimensionProperties Raster Dimension (Axis) Properties Raster/grid data only: Information about spatial-temporal axis properties (dimensions). NOTE: A raster/grid dataset will usually have 2+ axes or dimensions. Repeat this field to describe all dimensions represented in the dataset. none 28 FALSE FALSE TRUE FALSE FALSE FALSE geospatial
+ dimensionNameType Raster Dimension (Axis) Name Raster/grid data only: Name/type for one of the spatial-temporal axis represented in the dataset (row, column, vertical, track, crossTrack, line, sample, or time). For more information about axis dimension properties, please refer to ISO 19115-1:2014(E), Table B.7.1. row, column, vertical, track, crossTrack, line, sample, or time text 29 #VALUE FALSE TRUE FALSE FALSE FALSE FALSE axisDimensionProperties geospatial
+ dimensionSize Raster Dimension (Axis) Size Number of elements along the axis. int 30 FALSE FALSE FALSE FALSE FALSE FALSE axisDimensionProperties geospatial
+ resolution Raster Dimension (Axis) Resolution A decimal value representing a dimension's degree of detail, i.e. the size of the area that corresponds to a single data element along a dataset's axis. enter a decimal value float 31 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE axisDimensionProperties geospatial
+ resolutionUnitOfMeasure Raster Dimension (Axis) Resolution Unit of Measure Resolution unit of measure (e.g. 'cm', 'm', 'km', etc.) for the dimension/axis resolution value. cm', 'm', 'km', etc. text 32 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE axisDimensionProperties geospatial
+ cellGeometry Raster Cell Geometry Raster/grid data only: Identification of raster/grid data in this dataset as point, area or voxel (volumetric measurement on a regular grid in three-dimensional space). text 33 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial
+ distribution Distribution Link Distribution links are URLs that can be used to acess the dataset (e.g. via a geospatial web service). none 34 TRUE FALSE TRUE FALSE FALSE FALSE geospatial
+ distributionLink URL The distribution link is a URL that can be used to access the dataset (e.g. via a geospatial web service) text 35 #VALUE TRUE FALSE FALSE FALSE FALSE FALSE distribution geospatial
+ distributionLinkLabel Label A descriptive label for the distribution link. text 36 #VALUE TRUE FALSE FALSE FALSE FALSE FALSE distribution geospatial
+ protocol Protocol The service or transfer protocol associated with the distribution link URL (e.g. HTTPS, or FTP) HTTPS, FTP, HTTP, REST, etc. text 37 (#VALUE) TRUE FALSE FALSE FALSE FALSE FALSE distribution geospatial
+#controlledVocabulary DatasetField Value identifier displayOrder
+ country Afghanistan 0
+ country Albania 1
+ country Algeria 2
+ country American Samoa 3
+ country Andorra 4
+ country Angola 5
+ country Anguilla 6
+ country Antarctica 7
+ country Antigua and Barbuda 8
+ country Argentina 9
+ country Armenia 10
+ country Aruba 11
+ country Australia 12
+ country Austria 13
+ country Azerbaijan 14
+ country Bahamas 15
+ country Bahrain 16
+ country Bangladesh 17
+ country Barbados 18
+ country Belarus 19
+ country Belgium 20
+ country Belize 21
+ country Benin 22
+ country Bermuda 23
+ country Bhutan 24
+ country Bolivia, Plurinational State of 25
+ country Bonaire, Sint Eustatius and Saba 26
+ country Bosnia and Herzegovina 27
+ country Botswana 28 BOTSWANA
+ country Bouvet Island 29
+ country Brazil 30 Brasil
+ country British Indian Ocean Territory 31
+ country Brunei Darussalam 32
+ country Bulgaria 33
+ country Burkina Faso 34
+ country Burundi 35
+ country Cambodia 36
+ country Cameroon 37
+ country Canada 38
+ country Cape Verde 39
+ country Cayman Islands 40
+ country Central African Republic 41
+ country Chad 42
+ country Chile 43
+ country China 44
+ country Christmas Island 45
+ country Cocos (Keeling) Islands 46
+ country Colombia 47
+ country Comoros 48
+ country Congo 49
+ country Congo, the Democratic Republic of the 50
+ country Cook Islands 51
+ country Costa Rica 52
+ country Croatia 53
+ country Cuba 54
+ country Curaçao 55
+ country Cyprus 56
+ country Czech Republic 57
+ country Côte d'Ivoire 58
+ country Denmark 59
+ country Djibouti 60
+ country Dominica 61
+ country Dominican Republic 62
+ country Ecuador 63
+ country Egypt 64
+ country El Salvador 65
+ country Equatorial Guinea 66
+ country Eritrea 67
+ country Estonia 68
+ country Ethiopia 69
+ country Falkland Islands (Malvinas) 70
+ country Faroe Islands 71
+ country Fiji 72
+ country Finland 73
+ country France 74
+ country French Guiana 75
+ country French Polynesia 76
+ country French Southern Territories 77
+ country Gabon 78
+ country Gambia 79 Gambia, The
+ country Georgia 80
+ country Germany 81 Germany (Federal Republic of)
+ country Ghana 82 GHANA
+ country Gibraltar 83
+ country Greece 84
+ country Greenland 85
+ country Grenada 86
+ country Guadeloupe 87
+ country Guam 88
+ country Guatemala 89
+ country Guernsey 90
+ country Guinea 91
+ country Guinea-Bissau 92
+ country Guyana 93
+ country Haiti 94
+ country Heard Island and Mcdonald Islands 95
+ country Holy See (Vatican City State) 96
+ country Honduras 97
+ country Hong Kong 98
+ country Hungary 99
+ country Iceland 100
+ country India 101 INDIA
+ country Indonesia 102 Sumatra
+ country Iran, Islamic Republic of 103 Iran
+ country Iraq 104 IRAQ
+ country Ireland 105
+ country Isle of Man 106
+ country Israel 107
+ country Italy 108
+ country Jamaica 109
+ country Japan 110
+ country Jersey 111
+ country Jordan 112
+ country Kazakhstan 113
+ country Kenya 114
+ country Kiribati 115
+ country Korea, Democratic People's Republic of 116
+ country Korea, Republic of 117
+ country Kuwait 118
+ country Kyrgyzstan 119
+ country Lao People's Democratic Republic 120 Laos
+ country Latvia 121
+ country Lebanon 122
+ country Lesotho 123 LESOTHO
+ country Liberia 124
+ country Libya 125
+ country Liechtenstein 126
+ country Lithuania 127
+ country Luxembourg 128
+ country Macao 129
+ country Macedonia, the Former Yugoslav Republic of 130
+ country Madagascar 131
+ country Malawi 132
+ country Malaysia 133
+ country Maldives 134
+ country Mali 135
+ country Malta 136
+ country Marshall Islands 137
+ country Martinique 138
+ country Mauritania 139
+ country Mauritius 140
+ country Mayotte 141
+ country Mexico 142
+ country Micronesia, Federated States of 143
+ country Moldova, Republic of 144
+ country Monaco 145
+ country Mongolia 146
+ country Montenegro 147
+ country Montserrat 148
+ country Morocco 149
+ country Mozambique 150 MOZAMBIQUE
+ country Myanmar 151
+ country Namibia 152 NAMIBIA
+ country Nauru 153
+ country Nepal 154
+ country Netherlands 155
+ country New Caledonia 156
+ country New Zealand 157
+ country Nicaragua 158
+ country Niger 159
+ country Nigeria 160
+ country Niue 161
+ country Norfolk Island 162
+ country Northern Mariana Islands 163
+ country Norway 164
+ country Oman 165
+ country Pakistan 166
+ country Palau 167
+ country Palestine, State of 168
+ country Panama 169
+ country Papua New Guinea 170
+ country Paraguay 171
+ country Peru 172
+ country Philippines 173
+ country Pitcairn 174
+ country Poland 175
+ country Portugal 176
+ country Puerto Rico 177
+ country Qatar 178
+ country Romania 179
+ country Russian Federation 180
+ country Rwanda 181
+ country Réunion 182
+ country Saint Barthélemy 183
+ country Saint Helena, Ascension and Tristan da Cunha 184
+ country Saint Kitts and Nevis 185
+ country Saint Lucia 186
+ country Saint Martin (French part) 187
+ country Saint Pierre and Miquelon 188
+ country Saint Vincent and the Grenadines 189
+ country Samoa 190
+ country San Marino 191
+ country Sao Tome and Principe 192
+ country Saudi Arabia 193
+ country Senegal 194
+ country Serbia 195
+ country Seychelles 196
+ country Sierra Leone 197
+ country Singapore 198
+ country Sint Maarten (Dutch part) 199
+ country Slovakia 200
+ country Slovenia 201
+ country Solomon Islands 202
+ country Somalia 203
+ country South Africa 204
+ country South Georgia and the South Sandwich Islands 205
+ country South Sudan 206
+ country Spain 207
+ country Sri Lanka 208
+ country Sudan 209
+ country Suriname 210
+ country Svalbard and Jan Mayen 211
+ country Swaziland 212 SWAZILAND
+ country Sweden 213
+ country Switzerland 214
+ country Syrian Arab Republic 215
+ country Taiwan, Province of China 216 Taiwan
+ country Tajikistan 217
+ country Tanzania, United Republic of 218 Tanzania
+ country Thailand 219
+ country Timor-Leste 220
+ country Togo 221
+ country Tokelau 222
+ country Tonga 223
+ country Trinidad and Tobago 224
+ country Tunisia 225
+ country Turkey 226
+ country Turkmenistan 227
+ country Turks and Caicos Islands 228
+ country Tuvalu 229
+ country Uganda 230
+ country Ukraine 231
+ country United Arab Emirates 232 UAE
+ country United Kingdom 233
+ country United States 234 U.S.A United States of America U.S.A.
+ country United States Minor Outlying Islands 235
+ country Uruguay 236
+ country Uzbekistan 237
+ country Vanuatu 238
+ country Venezuela, Bolivarian Republic of 239
+ country Viet Nam 240
+ country Virgin Islands, British 241
+ country Virgin Islands, U.S. 242
+ country Wallis and Futuna 243
+ country Western Sahara 244
+ country Yemen 245 YEMEN
+ country Zambia 246
+ country Zimbabwe 247
+ country Åland Islands 248
+ geometricObjectType curve curve 0
+ geometricObjectType composite composite 1
+ geometricObjectType complex complex 2
+ geometricObjectType point point 3
+ geometricObjectType solid solid 4
+ geometricObjectType surface surface 5
+ cellGeometry point point 0
+ cellGeometry area area 1
+ cellGeometry voxel voxel 2
+ dimensionNameType row row 0
+ dimensionNameType column column 1
+ dimensionNameType vertical vertical 2
+ dimensionNameType track track 3
+ dimensionNameType crossTrack crossTrack 4
+ dimensionNameType line line 5
+ dimensionNameType sample sample 6
+ dimensionNameType time time 7
+ spatialRepresentationType stereoModel stereoModel 0
+ spatialRepresentationType video video 1
+ spatialRepresentationType tin tin 2
+ spatialRepresentationType textTable textTable 3
+ spatialRepresentationType grid grid 4
+ spatialRepresentationType vector vector 5
+ resourceType dataset dataset 0
+ resourceType service service 1
+ resourceType series series 2
+ referenceDateType revision revision 0
+ referenceDateType expiry expiry 1
+ referenceDateType lastUpdate lastUpdate 2
+ referenceDateType lastRevision lastRevision 3
+ referenceDateType nextUpdate nextUpdate 4
+ referenceDateType unavailable unavailable 5
+ referenceDateType inForce inForce 6
+ referenceDateType adopted adopted 7
+ referenceDateType deprecated deprecated 8
+ referenceDateType superseded superseded 9
+ referenceDateType publication publication 10
+ spatialResolutionType equivalentScale equivalentScale 0
+ spatialResolutionType distance distance 1
+ spatialResolutionType vertical vertical 2
+ spatialResolutionType angularDistance angularDistance 3
+ spatialResolutionType levelOfDetail levelOfDetail 4
\ No newline at end of file
diff --git a/src/main/java/propertyFiles/geospatial.properties b/src/main/java/propertyFiles/geospatial.properties
index abfbf252e37..2b697fb39db 100644
--- a/src/main/java/propertyFiles/geospatial.properties
+++ b/src/main/java/propertyFiles/geospatial.properties
@@ -34,6 +34,90 @@ datasetfieldtype.westLongitude.watermark=
datasetfieldtype.eastLongitude.watermark=
datasetfieldtype.northLatitude.watermark=
datasetfieldtype.southLatitude.watermark=
+datasetfieldtype.resourceType.title=Type of Geospatial Data Resource
+datasetfieldtype.resourceType.description=The type of geospatial data resource (dataset, service, or series) that is described in this metadata record.
+datasetfieldtype.resourceType.watermark=
+datasetfieldtype.referenceDate.title=Resource Reference Date
+datasetfieldtype.referenceDate.description=A date which is used to help identify the resource (ISO 19115-3)
+datasetfieldtype.referenceDate.watermark=
+datasetfieldtype.referenceDateValue.title=Date
+datasetfieldtype.referenceDateValue.description=Other date as expressed in yyyy-mm-dd
+datasetfieldtype.referenceDateValue.watermark=
+datasetfieldtype.referenceDateType.title=Type
+datasetfieldtype.referenceDateType.description=The type of date represented in the Date field.
+datasetfieldtype.referenceDateType.watermark=revision, expiry, lastUpdate, lastRevision, nextUpdate, unavailable, inForce, adopted, deprecated, superseded, publication
+datasetfieldtype.dataLineageStatement.title=Data Lineage Statement
+datasetfieldtype.dataLineageStatement.description=General explanation of the data producer's knowledge of the dataset lineage.
+datasetfieldtype.dataLineageStatement.watermark=
+datasetfieldtype.processStep.title=Data Lineage Process Step Description
+datasetfieldtype.processStep.description=Description of the processes performed on the data, as part of the dataset's lineage or processing history.
+datasetfieldtype.processStep.watermark=
+datasetfieldtype.referenceSystemInfo.title=Reference System Information
+datasetfieldtype.referenceSystemInfo.description=Description of the spatial and temporal reference systems used in the resource.
+datasetfieldtype.referenceSystemInfo.watermark=
+datasetfieldtype.referenceSystemCode.title=Reference System Code
+datasetfieldtype.referenceSystemCode.description=An alphanumeric identifier for the reference system for this data resource. The reference system provides a framework to define how the bounding box coordinates map to real-world locations.
+datasetfieldtype.referenceSystemCode.watermark=
+datasetfieldtype.referenceSystemCodeSpace.title=Reference System Code Space
+datasetfieldtype.referenceSystemCodeSpace.description=Identifier/ namespace of the system in which the reference system code is valid. E.g. "EPSG"
+datasetfieldtype.referenceSystemCodeSpace.watermark=EPSG, WGS, etc.
+datasetfieldtype.spatialResolution.title=Spatial Resolution
+datasetfieldtype.spatialResolution.description=The spatial resolution provides a general understanding of the density of spatial data in the resource, or describes the range of resolutions in which a digital resource may be used. Spatial resolution can be expressed as an equivalent scale (the scale of a comparable hardcopy map or chart), distance (horizontal ground sampling distance), vertical (vertical sampling distance), angularDistance (angular sampling distance), or level of detail (brief textual description of the spatial resolution of the resource). For more information please refer to ISO 19115-1:2014(E), Table B.3.4. NOTE: This element should be repeated when describing upper and lower range.
+datasetfieldtype.spatialResolution.watermark=
+datasetfieldtype.spatialResolutionValue.title=Value
+datasetfieldtype.spatialResolutionValue.description=The resource's spatial resolution, expressed as an equivalent scale, a distance, an angle, or a brief textual description.
+datasetfieldtype.spatialResolutionValue.watermark=
+datasetfieldtype.spatialResolutionType.title=Type
+datasetfieldtype.spatialResolutionType.description=Format in which the spatial resolution value is expressed (distance, vertical, angularDistance, levelOfDetail).
+datasetfieldtype.spatialResolutionType.watermark=distance, vertical, angularDistance, levelOfDetail
+datasetfieldtype.spatialRepresentationType.title=Spatial Representation Type
+datasetfieldtype.spatialRepresentationType.description=The type of spatial representation refers to the method or structure format that was used to represent geographic information (spatial data) in this dataset. Spatial representation can be as vector, raster (or grid), textTable (textual or tabular data), tin (triangulated irregular network), stereoModel (a 3-D view formed by intersecting homologous rays of an overlapping pair of images), or video (scene from a video recording). For more information about these types please refer to ISO 10115-1:2014(E), Tables B.3.29 and B.7.
+datasetfieldtype.spatialRepresentationType.watermark=
+datasetfieldtype.spatialResolutionUnitOfMeasure.title=Spatial Resolution Unit of Measure
+datasetfieldtype.spatialResolutionUnitOfMeasure.description=If the spatial resolution value is expressed as a distance, the unit of measure that corresponds to that value (e.g. 'cm', 'm', 'km', etc.)
+datasetfieldtype.spatialResolutionUnitOfMeasure.watermark='cm', 'm', 'km', etc.
+datasetfieldtype.distribution.title=Distribution Link
+datasetfieldtype.distribution.description=Distribution links are URLs that can be used to acess the dataset (e.g. via a geospatial web service).
+datasetfieldtype.distribution.watermark=
+datasetfieldtype.distributionLinkLabel.title=Label
+datasetfieldtype.distributionLinkLabel.description=A descriptive label for the distribution link.
+datasetfieldtype.distributionLinkLabel.watermark=
+datasetfieldtype.distributionLink.title=URL
+datasetfieldtype.distributionLink.description=The distribution link is a URL that can be used to access the dataset (e.g. via a geospatial web service)
+datasetfieldtype.distributionLink.watermark=
+datasetfieldtype.protocol.title=Protocol
+datasetfieldtype.protocol.description=The service or transfer protocol associated with the distribution link URL (e.g. HTTPS, or FTP)
+datasetfieldtype.protocol.watermark=HTTPS, FTP, HTTP, REST, etc.
+datasetfieldtype.vectorSpatialRepresentation.title=Vector Spatial Representation
+datasetfieldtype.vectorSpatialRepresentation.description=Information about vector spatial objects in the resource.
+datasetfieldtype.vectorSpatialRepresentation.watermark=
+datasetfieldtype.geometricObjectCount.title=Vector Object Count
+datasetfieldtype.geometricObjectCount.description=Vector data only: Total number of geometric objects (curve, composite, complex, point, solid, or surface) in the dataset.
+datasetfieldtype.geometricObjectCount.watermark=
+datasetfieldtype.geometricObjectType.title=Vector Object Type
+datasetfieldtype.geometricObjectType.description=Vector data only: The type of geometric objects (or shapes) that make up the structure of the vector dataset. Geometric objects can be used to locate zero, one, two or three dimensional locations on the dataset. Geometric object types can be curve (a bounded, 1-dimensional geometric primitive, representing the continuous image of a line), composite (connected set of curves, solids or surfaces), point (zero-dimensional geometric primitive, representing a position but not having an extent), surface (bounded, connected 2-dimensional geometric primitive, representing the continuous image of a region of a plane), solid (bounded, connected 3-dimensional geometric primitive, representing the continuous image of a region of space), or complex (a set of geometric primitives whose boundaries can be represented as a union of other primitives). For further details about vector geometric obvects, please refer to ISO 10115-1:2014(E), Table B.7.
+datasetfieldtype.geometricObjectType.watermark=curve, composite, complex, point, solid, or surface
+datasetfieldtype.numberOfDimensions.title=Raster Dimensions
+datasetfieldtype.numberOfDimensions.description=Raster/grid data only: The number of independent spatio-temporal axes, or dimensions, represented in the dataset. For further details about raster data cell geometry, please refer to ISO 19115-1:2014(E), Table B.7.
+datasetfieldtype.numberOfDimensions.watermark=
+datasetfieldtype.cellGeometry.title=Raster Cell Geometry
+datasetfieldtype.cellGeometry.description=Raster/grid data only: Identification of raster/grid data in this dataset as point, area or voxel (volumetric measurement on a regular grid in three-dimensional space).
+datasetfieldtype.cellGeometry.watermark=Identification of grid data as point or cell.
+datasetfieldtype.axisDimensionProperties.title=Raster Dimension (Axis) Properties
+datasetfieldtype.axisDimensionProperties.description=Raster/grid data only: Information about spatial-temporal axis properties (dimensions). NOTE: A raster/grid dataset will usually have 2+ axes or dimensions. Repeat this field to describe all dimensions represented in the dataset
+datasetfieldtype.axisDimensionProperties.watermark=
+datasetfieldtype.dimensionNameType.title=Raster Dimension (Axis) Name
+datasetfieldtype.dimensionNameType.description=Raster/grid data only: Name/type for one of the spatial-temporal axis represented in the dataset (row, column, vertical, track, crossTrack, line, sample, or time). For more information about axis dimension properties, please refer to ISO 19115-1:2014(E), Table B.7.1.
+datasetfieldtype.dimensionNameType.watermark=row, column, vertical, track, crossTrack, line, sample, or time
+datasetfieldtype.dimensionSize.title=Raster Dimension (Axis) Size
+datasetfieldtype.dimensionSize.description=Number of elements along the axis.
+datasetfieldtype.dimensionSize.watermark=
+datasetfieldtype.resolution.title=Raster Dimension (Axis) Resolution
+datasetfieldtype.resolution.description=A decimal value representing a dimension's degree of detail, i.e. the size of the area that corresponds to a single data element along a dataset's axis.
+datasetfieldtype.resolution.watermark=enter a decimal value
+datasetfieldtype.resolutionUnitOfMeasure.title=Raster Dimension (Axis) Resolution Unit of Measure
+datasetfieldtype.resolutionUnitOfMeasure.description=Resolution unit of measure (e.g. 'cm', 'm', 'km', etc.) for the dimension/axis resolution value.
+datasetfieldtype.resolutionUnitOfMeasure.watermark='cm', 'm', 'km', etc.
controlledvocabulary.country.afghanistan=Afghanistan
controlledvocabulary.country.albania=Albania
controlledvocabulary.country.algeria=Algeria
@@ -283,3 +367,47 @@ controlledvocabulary.country.yemen=Yemen
controlledvocabulary.country.zambia=Zambia
controlledvocabulary.country.zimbabwe=Zimbabwe
controlledvocabulary.country.aland_islands=Åland Islands
+controlledvocabulary.geometricObjectType.curve=curve
+controlledvocabulary.geometricObjectType.composite=composite
+controlledvocabulary.geometricObjectType.complex=complex
+controlledvocabulary.geometricObjectType.point=point
+controlledvocabulary.geometricObjectType.solid=solid
+controlledvocabulary.geometricObjectType.surface=surface
+controlledvocabulary.cellGeometry.point=point
+controlledvocabulary.cellGeometry.area=area
+controlledvocabulary.cellGeometry.voxel=voxel
+controlledvocabulary.dimensionNameType.row=row
+controlledvocabulary.dimensionNameType.column=column
+controlledvocabulary.dimensionNameType.vertical=vertical
+controlledvocabulary.dimensionNameType.track=track
+controlledvocabulary.dimensionNameType.crosstrack=crossTrack
+controlledvocabulary.dimensionNameType.line=line
+controlledvocabulary.dimensionNameType.sample=sample
+controlledvocabulary.dimensionNameType.time=time
+controlledvocabulary.spatialRepresentationType.stereomodel=stereoModel
+controlledvocabulary.spatialRepresentationType.video=video
+controlledvocabulary.spatialRepresentationType.tin=tin
+controlledvocabulary.spatialRepresentationType.texttable=textTable
+controlledvocabulary.spatialRepresentationType.grid=grid
+controlledvocabulary.spatialRepresentationType.vector=vector
+controlledvocabulary.dataQualityScope.dataset=dataset
+controlledvocabulary.dataQualityScope.service=service
+controlledvocabulary.resourceType.dataset=dataset
+controlledvocabulary.resourceType.service=service
+controlledvocabulary.resourceType.series=series
+controlledvocabulary.referenceDateType.revision=revision
+controlledvocabulary.referenceDateType.expiry=expiry
+controlledvocabulary.referenceDateType.lastupdate=lastUpdate
+controlledvocabulary.referenceDateType.lastrevision=lastRevision
+controlledvocabulary.referenceDateType.nextupdate=nextUpdate
+controlledvocabulary.referenceDateType.unavailable=unavailable
+controlledvocabulary.referenceDateType.inforce=inForce
+controlledvocabulary.referenceDateType.adopted=adopted
+controlledvocabulary.referenceDateType.deprecated=deprecated
+controlledvocabulary.referenceDateType.superseded=superseded
+controlledvocabulary.referenceDateType.publication=publication
+controlledvocabulary.spatialResolutionType.equivalentscale=equivalentScale
+controlledvocabulary.spatialResolutionType.distance=distance
+controlledvocabulary.spatialResolutionType.vertical=vertical
+controlledvocabulary.spatialResolutionType.angulardistance=angularDistance
+controlledvocabulary.spatialResolutionType.levelofdetail=levelOfDetail
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java
index b70ef04d4c0..9581dd3fff5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetFieldsIT.java
@@ -19,7 +19,7 @@ public static void setUpClass() {
void testListAllFacetableDatasetFields() {
Response listAllFacetableDatasetFieldsResponse = UtilIT.listAllFacetableDatasetFields();
listAllFacetableDatasetFieldsResponse.then().assertThat().statusCode(OK.getStatusCode());
- int expectedNumberOfFacetableDatasetFields = 64;
+ int expectedNumberOfFacetableDatasetFields = 71;
listAllFacetableDatasetFieldsResponse.then().assertThat()
.statusCode(OK.getStatusCode())
.body("data[0].name", equalTo("authorName"))
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java
index ce914531839..dc246b77a47 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java
@@ -570,7 +570,7 @@ public void testUpdateDatasetTypeLinksWithMetadataBlocks() {
.body("data[0].name", is("citation"))
.body("data[1].name", is("geospatial"))
.body("data[0].fields.size()", is(35))
- .body("data[1].fields.size()", is(3));
+ .body("data[1].fields.size()", is(16));
System.out.println("listing " + dataverseAlias + " collection blocks and inner dataset field types, with display on create and return dataset field types set to true using dataset type " + randomName);
listBlocks = UtilIT.listMetadataBlocks(dataverseAlias, true, true, randomName, apiToken);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index db5bf41053e..d2dca1dc4d9 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -1341,7 +1341,7 @@ public void testListMetadataBlocks() {
// Since the included property of geographicCoverage is set to false, we should retrieve the total number of fields minus one
listMetadataBlocksResponse.then().assertThat()
- .body(String.format("data[%d].fields.size()", geospatialMetadataBlockIndex), equalTo(2));
+ .body(String.format("data[%d].fields.size()", geospatialMetadataBlockIndex), equalTo(15));
listMetadataBlocksResponse = UtilIT.getMetadataBlock("geospatial");
String actualGeospatialMetadataField1 = listMetadataBlocksResponse.then().extract().path(String.format("data.fields['geographicCoverage'].name"));