diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml index 34f888acec4..4d65b378485 100644 --- a/conf/solr/schema.xml +++ b/conf/solr/schema.xml @@ -339,9 +339,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -596,9 +621,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/release-notes/10398-geospatial-block.md b/doc/release-notes/10398-geospatial-block.md new file mode 100644 index 00000000000..50eea141883 --- /dev/null +++ b/doc/release-notes/10398-geospatial-block.md @@ -0,0 +1,22 @@ +## New Expanded Geospatial Metadata Block + +This release introduces a major enhancement to geospatial data support with the addition of an expanded Geospatial Metadata Block, designed to improve how researchers describe, share, and discover geospatial datasets. + +This new expanded metadata block aligns with the international ISO 19115 standard for describing geographic data. + +- Includes 22 new metadata fields to provide more detailed and standardized descriptions of geospatial data (e.g. vector, raster, mixed or multi-format geospatial collections) +- Incorporates and extends current metadata elements (Geographic Coverage and Geographic Bounding Box) +- Ensures backward compatibility while significantly improving metadata description capabilities. + +See [the guides](https://dataverse-guide--11507.org.readthedocs.build/en/11507/user/appendix.html#supported-metadata), #10398, and #11507. + +## Upgrade Instructions + +### 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/doc/sphinx-guides/source/user/appendix.rst b/doc/sphinx-guides/source/user/appendix.rst index e2c78e1e99c..57e0d5ed799 100755 --- a/doc/sphinx-guides/source/user/appendix.rst +++ b/doc/sphinx-guides/source/user/appendix.rst @@ -25,9 +25,7 @@ Supported Metadata Detailed below are what metadata schemas we support for Citation and Domain Specific Metadata in the Dataverse Project: - Citation Metadata (`see .tsv `__): compliant with `DDI Lite `_, `DDI 2.5 Codebook `__, `DataCite 4.5 `__, and Dublin Core's `DCMI Metadata Terms `__ . Language field uses `ISO 639-1 `__ controlled vocabulary. -- Geospatial Metadata (`see .tsv `__): compliant with `DDI Lite `_, `DDI 2.5 Codebook `__, `DataCite 4.5 `__, and Dublin Core. Country / Nation field uses `ISO 3166-1 `_ controlled vocabulary. - - - Please note that a new and improved Geospatial metadata block is being proposed at ``__. We encourage you to try the block and give feedback in that pull request. +- Geospatial Metadata (`see .tsv `__): compliant with `ISO 19115 `_, `DDI Lite `_, `DDI 2.5 Codebook `__, `DataCite 4.5 `__, and Dublin Core. Country / Nation field uses `ISO 3166-1 `_ controlled vocabulary. - Social Science & Humanities Metadata (`see .tsv `__): compliant with `DDI Lite `_, `DDI 2.5 Codebook `__, and Dublin Core. - Astronomy and Astrophysics Metadata (`see .tsv `__): These metadata elements can be mapped/exported to the International Virtual Observatory Alliance’s (IVOA) `VOResource Schema format `__ and is based on diff --git a/scripts/api/data/metadatablocks/geospatial.tsv b/scripts/api/data/metadatablocks/geospatial.tsv index 11408317410..3f4b4db35a8 100644 --- a/scripts/api/data/metadatablocks/geospatial.tsv +++ b/scripts/api/data/metadatablocks/geospatial.tsv @@ -1,17 +1,44 @@ #metadataBlock name dataverseAlias displayName geospatial Geospatial Metadata -#datasetField name title description watermark fieldType displayOrder displayFormat advancedSearchField allowControlledVocabulary allowmultiples facetable displayoncreate required parent metadatablock_id +#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 + 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 + 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 + geographicReferenceSystemInfo Reference System Information The spatial and temporal reference systems used in the Dataset none 11 FALSE FALSE TRUE FALSE FALSE FALSE geospatial + geographicReferenceSystemCode Reference System Code An alphanumeric identifier for the reference system for the Dataset text 12 #VALUE FALSE FALSE FALSE TRUE FALSE FALSE geographicReferenceSystemInfo geospatial + geographicReferenceSystemCodeSpace Reference System Code Space The namespace of the system in which the reference system code is valid EPSG, WGS, etc. text 13 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE geographicReferenceSystemInfo geospatial + geographicSpatialResolution Spatial Resolution The density of spatial data in the resource, or the range of resolutions in which a Dataset may be used. NOTE: This element should be repeated when describing upper and lower range none 14 FALSE FALSE TRUE FALSE FALSE FALSE geospatial + geographicSpatialResolutionValue Value The resource's spatial resolution, expressed as a value or as a brief textual description text 15 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE geographicSpatialResolution geospatial + geographicSpatialResolutionType Type Format in which the spatial resolution value is expressed distance, vertical, angularDistance, levelOfDetail text 16 (#VALUE) FALSE TRUE FALSE TRUE FALSE FALSE geographicSpatialResolution geospatial + geographicSpatialResolutionUnitOfMeasure Spatial Resolution Unit of Measure If the spatial resolution value is expressed as a distance, the unit of measure that corresponds to that value cm', 'm', 'km', etc. text 17 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE geographicSpatialResolution geospatial + geographicResourceType Type of Geospatial Data Resource The type of geospatial data resource that is described in this Dataset record text 18 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial + geographicReferenceDate Resource Reference Date A date which is used to help identify the resource none 19 TRUE FALSE TRUE FALSE FALSE FALSE geospatial + geographicReferenceDateValue Date A date which is used to help identify the resource yyyy-mm-dd date 20 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE geographicReferenceDate geospatial + geographicReferenceDateType 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 geographicReferenceDate geospatial + geographicDataLineageStatement Data Lineage Statement A statement about the Dataset's lineage textbox 22 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE geospatial + geographicProcessStep Data Lineage Process Step Description A description of the processes performed on the data as part of the Dataset's processing history textbox 23 #VALUE FALSE FALSE TRUE FALSE FALSE FALSE geospatial + geographicSpatialRepresentationType Spatial Representation Type The type of spatial representation of the data in the Dataset text 24 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial + geometricObjectCount Vector Object Count Vector data only: Total number of geometric objects 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 curve, composite, complex, point, solid, or surface text 26 (#VALUE) FALSE TRUE FALSE TRUE FALSE FALSE geospatial + geographicNumberOfDimensions Raster Dimensions Raster/grid data only: The number of independent spatio-temporal axes, or dimensions, represented in the Dataset int 27 TRUE FALSE FALSE FALSE FALSE FALSE geospatial + geographicAxisDimensionProperties Raster Dimension (Axis) Properties Raster/grid data only: Information about spatial-temporal axis properties (dimensions). NOTE: A raster Dataset will usually have 2+ dimensions. Repeat this field to describe all dimensions represented in the Dataset none 28 FALSE FALSE TRUE FALSE FALSE FALSE geospatial + geographicDimensionNameType 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 text 29 #VALUE FALSE TRUE FALSE FALSE FALSE FALSE geographicAxisDimensionProperties geospatial + geographicDimensionSize Raster Dimension (Axis) Size Number of elements along the axis int 30 FALSE FALSE FALSE FALSE FALSE FALSE geographicAxisDimensionProperties geospatial + geographicResolution 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 geographicAxisDimensionProperties geospatial + geographicResolutionUnitOfMeasure Raster Dimension (Axis) Resolution Unit of Measure Resolution unit of measure for the dimension resolution value cm', 'm', 'km', etc. text 32 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE geographicAxisDimensionProperties geospatial + geographicCellGeometry Raster Cell Geometry Raster/grid data only: Identification of raster data in this Dataset text 33 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE geospatial + geographicDistribution Distribution Link Distribution links are URLs that can be used to access the Dataset none 34 TRUE FALSE TRUE FALSE FALSE FALSE geospatial + geographicDistributionLink URL The distribution link is a URL that can be used to access the datase text 35 #VALUE TRUE FALSE FALSE FALSE FALSE FALSE geographicDistribution geospatial + geographicDistributionLinkLabel Label A descriptive label for the distribution link text 36 #VALUE TRUE FALSE FALSE FALSE FALSE FALSE geographicDistribution geospatial + geographicProtocol Protocol The service or transfer protocol associated with the distribution link URL HTTPS, FTP, HTTP, REST, etc. text 37 (#VALUE) TRUE FALSE FALSE FALSE FALSE FALSE geographicDistribution geospatial #controlledVocabulary DatasetField Value identifier displayOrder country Afghanistan 0 country Albania 1 @@ -262,3 +289,45 @@ 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 + geographicCellGeometry point point 0 + geographicCellGeometry area area 1 + geographicCellGeometry voxel voxel 2 + geographicDimensionNameType row row 0 + geographicDimensionNameType column column 1 + geographicDimensionNameType vertical vertical 2 + geographicDimensionNameType track track 3 + geographicDimensionNameType crossTrack crossTrack 4 + geographicDimensionNameType line line 5 + geographicDimensionNameType sample sample 6 + geographicDimensionNameType time time 7 + geographicSpatialRepresentationType stereoModel stereoModel 0 + geographicSpatialRepresentationType video video 1 + geographicSpatialRepresentationType tin tin 2 + geographicSpatialRepresentationType textTable textTable 3 + geographicSpatialRepresentationType grid grid 4 + geographicSpatialRepresentationType vector vector 5 + geographicResourceType dataset dataset 0 + geographicResourceType service service 1 + geographicResourceType series series 2 + geographicReferenceDateType revision revision 0 + geographicReferenceDateType expiry expiry 1 + geographicReferenceDateType lastUpdate lastUpdate 2 + geographicReferenceDateType lastRevision lastRevision 3 + geographicReferenceDateType nextUpdate nextUpdate 4 + geographicReferenceDateType unavailable unavailable 5 + geographicReferenceDateType inForce inForce 6 + geographicReferenceDateType adopted adopted 7 + geographicReferenceDateType deprecated deprecated 8 + geographicReferenceDateType superseded superseded 9 + geographicReferenceDateType publication publication 10 + geographicSpatialResolutionType equivalentScale equivalentScale 0 + geographicSpatialResolutionType distance distance 1 + geographicSpatialResolutionType vertical vertical 2 + geographicSpatialResolutionType angularDistance angularDistance 3 + geographicSpatialResolutionType levelOfDetail levelOfDetail 4 diff --git a/src/main/java/propertyFiles/geospatial.properties b/src/main/java/propertyFiles/geospatial.properties index abfbf252e37..0187a70175f 100644 --- a/src/main/java/propertyFiles/geospatial.properties +++ b/src/main/java/propertyFiles/geospatial.properties @@ -34,6 +34,87 @@ datasetfieldtype.westLongitude.watermark= datasetfieldtype.eastLongitude.watermark= datasetfieldtype.northLatitude.watermark= datasetfieldtype.southLatitude.watermark= +datasetfieldtype.geographicResourceType.title=Type of Geospatial Data Resource +datasetfieldtype.geographicResourceType.description=The type of geospatial data resource that is described in this Dataset record +datasetfieldtype.geographicResourceType.watermark= +datasetfieldtype.geographicReferenceDate.title=Resource Reference Date +datasetfieldtype.geographicReferenceDate.description=A date which is used to help identify the resource (ISO 19115-3) +datasetfieldtype.geographicReferenceDate.watermark= +datasetfieldtype.geographicReferenceDateValue.title=Date +datasetfieldtype.geographicReferenceDateValue.description=A date which is used to help identify the resource +datasetfieldtype.geographicReferenceDateValue.watermark=yyyy-mm-dd +datasetfieldtype.geographicReferenceDateType.title=Type +datasetfieldtype.geographicReferenceDateType.description=The type of date represented in the Date field +datasetfieldtype.geographicReferenceDateType.watermark=revision, expiry, lastUpdate, lastRevision, nextUpdate, unavailable, inForce, adopted, deprecated, superseded, publication +datasetfieldtype.geographicDataLineageStatement.title=Data Lineage Statement +datasetfieldtype.geographicDataLineageStatement.description=A statement about the Dataset's lineage +datasetfieldtype.geographicDataLineageStatement.watermark= +datasetfieldtype.geographicProcessStep.title=Data Lineage Process Step Description +datasetfieldtype.geographicProcessStep.description=A description of the processes performed on the data as part of the Dataset's processing history +datasetfieldtype.geographicProcessStep.watermark= +datasetfieldtype.geographicReferenceSystemInfo.title=Reference System Information +datasetfieldtype.geographicReferenceSystemInfo.description=The spatial and temporal reference systems used in the Dataset +datasetfieldtype.geographicReferenceSystemInfo.watermark= +datasetfieldtype.geographicReferenceSystemCode.title=Reference System Code +datasetfieldtype.geographicReferenceSystemCode.description=An alphanumeric identifier for the reference system for the Dataset +datasetfieldtype.geographicReferenceSystemCode.watermark= +datasetfieldtype.geographicReferenceSystemCodeSpace.title=Reference System Code Space +datasetfieldtype.geographicReferenceSystemCodeSpace.description=The namespace of the system in which the reference system code is valid +datasetfieldtype.geographicReferenceSystemCodeSpace.watermark=EPSG, WGS, etc. +datasetfieldtype.geographicSpatialResolution.title=Spatial Resolution +datasetfieldtype.geographicSpatialResolution.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. NOTE: This element should be repeated when describing upper and lower range +datasetfieldtype.geographicSpatialResolution.watermark= +datasetfieldtype.geographicSpatialResolutionValue.title=Value +datasetfieldtype.geographicSpatialResolutionValue.description=The resource's spatial resolution, expressed as a value or as a brief textual description +datasetfieldtype.geographicSpatialResolutionValue.watermark= +datasetfieldtype.geographicSpatialResolutionType.title=Type +datasetfieldtype.geographicSpatialResolutionType.description=Format in which the spatial resolution value is expressed +datasetfieldtype.geographicSpatialResolutionType.watermark=distance, vertical, angularDistance, levelOfDetail +datasetfieldtype.geographicSpatialRepresentationType.title=Spatial Representation Type +datasetfieldtype.geographicSpatialRepresentationType.description=Spatial Representation Type The type of spatial representation of the data in the Dataset +datasetfieldtype.geographicSpatialRepresentationType.watermark= +datasetfieldtype.geographicSpatialResolutionUnitOfMeasure.title=Spatial Resolution Unit of Measure +datasetfieldtype.geographicSpatialResolutionUnitOfMeasure.description=If the spatial resolution value is expressed as a distance, the unit of measure that corresponds to that value +datasetfieldtype.geographicSpatialResolutionUnitOfMeasure.watermark='cm', 'm', 'km', etc. +datasetfieldtype.geographicDistribution.title=Distribution Link +datasetfieldtype.geographicDistribution.description=Distribution links are URLs that can be used to access the Dataset +datasetfieldtype.geographicDistribution.watermark= +datasetfieldtype.geographicDistributionLinkLabel.title=Label +datasetfieldtype.geographicDistributionLinkLabel.description=A descriptive label for the distribution link +datasetfieldtype.geographicDistributionLinkLabel.watermark= +datasetfieldtype.geographicDistributionLink.title=URL +datasetfieldtype.geographicDistributionLink.description=The distribution link is a URL that can be used to access the dataset +datasetfieldtype.geographicDistributionLink.watermark= +datasetfieldtype.geographicProtocol.title=Protocol +datasetfieldtype.geographicProtocol.description=The service or transfer protocol associated with the distribution link URL +datasetfieldtype.geographicProtocol.watermark=HTTPS, FTP, HTTP, REST, etc. +datasetfieldtype.geometricObjectCount.title=Vector Object Count +datasetfieldtype.geometricObjectCount.description=Vector data only: Total number of geometric objects 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 +datasetfieldtype.geometricObjectType.watermark=curve, composite, complex, point, solid, or surface +datasetfieldtype.geographicNumberOfDimensions.title=Raster Dimensions +datasetfieldtype.geographicNumberOfDimensions.description=Raster/grid data only: The number of independent spatio-temporal axes, or dimensions, represented in the Dataset +datasetfieldtype.geographicNumberOfDimensions.watermark= +datasetfieldtype.geographicCellGeometry.title=Raster Cell Geometry +datasetfieldtype.geographicCellGeometry.description=Raster/grid data only: Identification of raster data in this Dataset +datasetfieldtype.geographicCellGeometry.watermark= +datasetfieldtype.geographicAxisDimensionProperties.title=Raster Dimension (Axis) Properties +datasetfieldtype.geographicAxisDimensionProperties.description=Raster/grid data only: Information about spatial-temporal axis properties (dimensions). NOTE: A raster Dataset will usually have 2+ dimensions. Repeat this field to describe all dimensions represented in the Dataset +datasetfieldtype.geographicAxisDimensionProperties.watermark= +datasetfieldtype.geographicDimensionNameType.title=Raster Dimension (Axis) Name +datasetfieldtype.geographicDimensionNameType.description=Raster/grid data only: Name/type for one of the spatial-temporal axis represented in the Dataset +datasetfieldtype.geographicDimensionNameType.watermark=row, column, vertical, track, crossTrack, line, sample, or time +datasetfieldtype.geographicDimensionSize.title=Raster Dimension (Axis) Size +datasetfieldtype.geographicDimensionSize.description=Number of elements along the axis +datasetfieldtype.geographicDimensionSize.watermark= +datasetfieldtype.geographicResolution.title=Raster Dimension (Axis) Resolution +datasetfieldtype.geographicResolution.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.geographicResolution.watermark=enter a decimal value +datasetfieldtype.geographicResolutionUnitOfMeasure.title=Raster Dimension (Axis) Resolution Unit of Measure +datasetfieldtype.geographicResolutionUnitOfMeasure.description=Resolution unit of measure for the dimension resolution value. +datasetfieldtype.geographicResolutionUnitOfMeasure.watermark='cm', 'm', 'km', etc. controlledvocabulary.country.afghanistan=Afghanistan controlledvocabulary.country.albania=Albania controlledvocabulary.country.algeria=Algeria @@ -283,3 +364,45 @@ 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.geographicCellGeometry.point=point +controlledvocabulary.geographicCellGeometry.area=area +controlledvocabulary.geographicCellGeometry.voxel=voxel +controlledvocabulary.geographicDimensionNameType.row=row +controlledvocabulary.geographicDimensionNameType.column=column +controlledvocabulary.geographicDimensionNameType.vertical=vertical +controlledvocabulary.geographicDimensionNameType.track=track +controlledvocabulary.geographicDimensionNameType.crosstrack=crossTrack +controlledvocabulary.geographicDimensionNameType.line=line +controlledvocabulary.geographicDimensionNameType.sample=sample +controlledvocabulary.geographicDimensionNameType.time=time +controlledvocabulary.geographicSpatialRepresentationType.stereomodel=stereoModel +controlledvocabulary.geographicSpatialRepresentationType.video=video +controlledvocabulary.geographicSpatialRepresentationType.tin=tin +controlledvocabulary.geographicSpatialRepresentationType.texttable=textTable +controlledvocabulary.geographicSpatialRepresentationType.grid=grid +controlledvocabulary.geographicSpatialRepresentationType.vector=vector +controlledvocabulary.geographicResourceType.dataset=dataset +controlledvocabulary.geographicResourceType.service=service +controlledvocabulary.geographicResourceType.series=series +controlledvocabulary.geographicReferenceDateType.revision=revision +controlledvocabulary.geographicReferenceDateType.expiry=expiry +controlledvocabulary.geographicReferenceDateType.lastupdate=lastUpdate +controlledvocabulary.geographicReferenceDateType.lastrevision=lastRevision +controlledvocabulary.geographicReferenceDateType.nextupdate=nextUpdate +controlledvocabulary.geographicReferenceDateType.unavailable=unavailable +controlledvocabulary.geographicReferenceDateType.inforce=inForce +controlledvocabulary.geographicReferenceDateType.adopted=adopted +controlledvocabulary.geographicReferenceDateType.deprecated=deprecated +controlledvocabulary.geographicReferenceDateType.superseded=superseded +controlledvocabulary.geographicReferenceDateType.publication=publication +controlledvocabulary.geographicSpatialResolutionType.equivalentscale=equivalentScale +controlledvocabulary.geographicSpatialResolutionType.distance=distance +controlledvocabulary.geographicSpatialResolutionType.vertical=vertical +controlledvocabulary.geographicSpatialResolutionType.angulardistance=angularDistance +controlledvocabulary.geographicSpatialResolutionType.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"));