From: <jos...@us...> - 2012-02-08 14:37:21
|
Revision: 8673 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=8673&view=rev Author: josegar74 Date: 2012-02-08 14:37:07 +0000 (Wed, 08 Feb 2012) Log Message: ----------- #770: INSPIRE search form: fix service type list and add option to search by classification of data services. Added these fields in INSPIRE search widget. Modified Paths: -------------- trunk/docs/eng/users/source/quickstartguide/getting_started/index.rst trunk/web/src/main/webapp/geonetwork.css trunk/web/src/main/webapp/loc/ar/xml/strings.xml trunk/web/src/main/webapp/loc/ca/xml/strings.xml trunk/web/src/main/webapp/loc/cn/xml/strings.xml trunk/web/src/main/webapp/loc/de/xml/strings.xml trunk/web/src/main/webapp/loc/en/xml/strings.xml trunk/web/src/main/webapp/loc/es/xml/strings.xml trunk/web/src/main/webapp/loc/fi/xml/strings.xml trunk/web/src/main/webapp/loc/fr/xml/strings.xml trunk/web/src/main/webapp/loc/nl/xml/strings.xml trunk/web/src/main/webapp/loc/no/xml/strings.xml trunk/web/src/main/webapp/loc/pt/xml/strings.xml trunk/web/src/main/webapp/loc/ru/xml/strings.xml trunk/web/src/main/webapp/scripts/gn_search.js trunk/web/src/main/webapp/xsl/searchform_advanced.xsl trunk/web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/en.js trunk/web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/fr.js trunk/web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/util/INSPIRESearchFormTools.js Added Paths: ----------- trunk/docs/eng/users/source/quickstartguide/getting_started/advanced_search_inspire.png Added: trunk/docs/eng/users/source/quickstartguide/getting_started/advanced_search_inspire.png =================================================================== (Binary files differ) Property changes on: trunk/docs/eng/users/source/quickstartguide/getting_started/advanced_search_inspire.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/docs/eng/users/source/quickstartguide/getting_started/index.rst =================================================================== --- trunk/docs/eng/users/source/quickstartguide/getting_started/index.rst 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/docs/eng/users/source/quickstartguide/getting_started/index.rst 2012-02-08 14:37:07 UTC (rev 8673) @@ -144,6 +144,24 @@ *Other options in the Advanced search* +Inspire +``````` +If INSPIRE Search panel is enable in Administration > System configuration page, an additional section is displayed to allow searching INSPIRE metadata in the catalog. + + .. figure:: advanced_search_inspire.png + + *"Inspire" section in the Advanced search* + +- *Annex*: Allows to search for metadata related to a specific Inspire annex. The Inspire annexes for a metadata are based on the Inspire theme keywords assigned to it. + +- *Source type*: Allows to search for dataset or service metadata. + +- *Service type*: Allows to search for service metadata using the service type values defined in INSPIRE metadata regulation (section 1.3.1). + +- *Classification of data services*: Allows to search for metadata that have selected keyword from the *Inspire service taxonomy* thesaurus. + +- *Inspire themes*: Allows to search for metadata that have selected keywords from the *Inspire themes* thesaurus. + Search Results -------------- Modified: trunk/web/src/main/webapp/geonetwork.css =================================================================== --- trunk/web/src/main/webapp/geonetwork.css 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/geonetwork.css 2012-02-08 14:37:07 UTC (rev 8673) @@ -1114,6 +1114,15 @@ font-size: 0.9em; } +span.labelFieldDisabled { + display: table-cell; + display: inline-block; + width: 180px; + vertical-align: top; + font-size: 0.9em; + color: #b4b4b4; +} + span.labelFieldSmall { display: table-cell; display: inline-block; Modified: trunk/web/src/main/webapp/loc/ar/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2012-02-08 14:37:07 UTC (rev 8673) @@ -1144,6 +1144,116 @@ </searchhelp> <inspire> + <serviceType> + <value id="discovery">Discovery Service (discovery)</value> + <value id="view">View Service (view)</value> + <value id="download">Download Service (download)</value> + <value id="transformation">Transformation Service (transformation)</value> + <value id="invoke">Invoke Spatial Data Service (invoke)</value> + <value id="other">Other Services (other)</value> + </serviceType> + <spatialDataService> + <group label="Geographic human interaction services"> + <value id="humanInteractionService">Geographic human interaction services</value> + <value id="humanCatalogueViewer">Catalogue viewer</value> + <value id="humanGeographicViewer">Geographic viewer</value> + <value id="humanGeographicSpreadsheetViewer">Geographic spreadsheet viewer</value> + <value id="humanChainDefinitionEditor">Chain definition editor</value> + <value id="humanWorkflowEnactmentManager">Workflow enactment manager</value> + <value id="humanGeographicFeatureEditor">Geographic feature editor</value> + <value id="humanGeographicSymbolEditor">Geographic symbol editor</value> + <value id="humanFeatureGeneralizationEditor">Feature generalisation editor</value> + <value id="humanGeographicDataStructureViewer">Geographic data-structure viewer</value> + </group> + + <group label="Geographic model/information management service"> + <value id="infoManagementService">Geographic model/information management service</value> + <value id="infoFeatureAccessService">Feature access service</value> + <value id="infoMapAccessService">Map access service</value> + <value id="infoCoverageAccessService">Coverage access service</value> + <value id="infoSensorDescriptionService">Sensor description service</value> + <value id="infoProductAccessService">Product access service</value> + <value id="infoFeatureTypeService">Feature type service</value> + <value id="infoCatalogueService">Catalogue service</value> + <value id="infoRegistryService">Registry service</value> + <value id="infoGazetteerService">Gazetteer service</value> + <value id="infoOrderHandlingService">Order handling service</value> + <value id="infoStandingOrderService">Standing order service</value> + </group> + + <group label="Geographic workflow/task management services"> + <value id="taskManagementService">Geographic workflow/task management services</value> + <value id="chainDefinitionService">Chain definition service</value> + <value id="workflowEnactmentService">Workflow enactment service</value> + <value id="subscriptionService">Subscription service</value> + </group> + + <group label="Geographic processing services – spatial"> + <value id="spatialProcessingService">Geographic processing services – spatial</value> + <value id="spatialCoordinateConversionService">Coordinate conversion service </value> + <value id="spatialCoordinateTransformationService">Coordinate transformation service </value> + <value id="spatialCoverageVectorConversionService">Coverage/vector conversion service </value> + <value id="spatialImageCoordinateConversionService">Image coordinate conversion service</value> + <value id="spatialRectificationService">Rectification service</value> + <value id="spatialOrthorectificationService">Orthorectification service</value> + <value id="spatialSensorGeometryModelAdjustmentService">Sensor geometry model adjustment service</value> + <value id="spatialImageGeometryModelConversionService">Image geometry model conversion service</value> + <value id="spatialSubsettingService">Subsetting service</value> + <value id="spatialSamplingService">Sampling service</value> + <value id="spatialTilingChangeService">Tiling change service</value> + <value id="spatialDimensionMeasurementService">Dimension measurement service</value> + <value id="spatialFeatureManipulationService">Feature manipulation services</value> + <value id="spatialFeatureMatchingService">Feature matching service</value> + <value id="spatialFeatureGeneralizationService">Feature generalisation service</value> + <value id="spatialRouteDeterminationService">Route determination service</value> + <value id="spatialPositioningService">Positioning service</value> + <value id="spatialProximityAnalysisService">Proximity analysis service</value> + </group> + + <group label="Geographic processing services – thematic"> + <value id="thematicProcessingService">Geographic processing services – thematic</value> + <value id="thematicGoparameterCalculationService">Geoparameter calculation service</value> + <value id="thematicClassificationService">Thematic classification service</value> + <value id="thematicFeatureGeneralizationService">Feature generalisation service</value> + <value id="thematicSubsettingService">Subsetting service</value> + <value id="thematicSpatialCountingService">Spatial counting service</value> + <value id="thematicChangeDetectionService">Change detection service</value> + <value id="thematicGeographicInformationExtractionService">Geographic information extraction services</value> + <value id="thematicImageProcessingService">Image processing service</value> + <value id="thematicReducedResolutionGenerationService">Reduced resolution generation service</value> + <value id="thematicImageManipulationService">Image Manipulation Services</value> + <value id="thematicImageUnderstandingService">Image understanding services</value> + <value id="thematicImageSynthesisService">Image synthesis services</value> + <value id="thematicMultibandImageManipulationService">Multiband image manipulation</value> + <value id="thematicObjectDetectionService">Object detection service</value> + <value id="thematicGeoparsingService">Geoparsing service</value> + <value id="thematicGeocodingService">Geocoding service</value> + </group> + + <group label="Geographic processing services – temporal"> + <value id="temporalProcessingService">Geographic processing services – temporal</value> + <value id="temporalReferenceSystemTransformationService"> Temporal reference system transformation service</value> + <value id="temporalSubsettingService">Subsetting service</value> + <value id="temporalSamplingService">Sampling service</value> + <value id="temporalProximityAnalysisService">Temporal proximity analysis service</value> + </group> + + <group label="Geographic processing services – metadata"> + <value id="metadataProcessingService">Geographic processing services – metadata</value> + <value id="metadataStatisticalCalculationService">Statistical calculation service</value> + <value id="metadataGeographicAnnotationService">Geographic annotation services</value> + </group> + + <group label="Geographic communication services"> + <value id="comService">Geographic communication services</value> + <value id="comEncodingService">Encoding service</value> + <value id="comTransferService">Transfer service</value> + <value id="comGeographicCompressionService">Geographic compression service</value> + <value id="comGeographicFormatConversionService">Geographic format conversion service</value> + <value id="comMessagingService">Messaging service</value> + <value id="comRemoteFileAndExecutableManagement">Remote file and executable management</value> + </group> + </spatialDataService> <what> <l1>INSPIRE search options</l1> <l2>INSPIRE metadata</l2> @@ -1160,46 +1270,47 @@ <l13>Hide INSPIRE Themes</l13> <l14>INSPIRE Theme</l14> <l15>Service type</l15> + <l16>Classification of data services</l16> </what> <annex1> - <l1>Coordinate reference systems</l1> - <l2>Geographical grid systems</l2> - <l3>Geographical names</l3> - <l4>Administrative units</l4> - <l5>Addresses</l5> - <l6>Cadastral parcels</l6> - <l7>Transport networks</l7> - <l8>Hydrography</l8> - <l9>Protected sites</l9> + <theme id="inspire_CoordinateRefSystems">Coordinate reference systems</theme> + <theme id="inspire_GeographicalGridSystems">Geographical grid systems</theme> + <theme id="inspire_GeographicalNames">Geographical names</theme> + <theme id="inspire_AdministrativeUnits">Administrative units</theme> + <theme id="inspire_Addresses">Addresses</theme> + <theme id="inspire_CadastralParcels">Cadastral parcels</theme> + <theme id="inspire_TransportNetworks">Transport networks</theme> + <theme id="inspire_Hydrography">Hydrography</theme> + <theme id="inspire_ProtectedSites">Protected sites</theme> </annex1> <annex2> - <l1>Elevation</l1> - <l2>Land cover</l2> - <l3>Orthoimagery</l3> - <l4>Geology</l4> + <theme id="inspire_Elevation">Elevation</theme> + <theme id="inspire_LandCover">Land cover</theme> + <theme id="inspire_Orthoimagery">Orthoimagery</theme> + <theme id="inspire_Geology">Geology</theme> </annex2> <annex3> - <l1>Statistical units</l1> - <l2>Buildings</l2> - <l3>Soil</l3> - <l4>Land use</l4> - <l5>Human health and safety</l5> - <l6>Utility and Government services</l6> - <l7>Environmental monitoring facilities</l7> - <l8>Production and industrial facilities</l8> - <l9>Agriculture and aquaculture facilities</l9> - <l10>Population distribution - demography</l10> - <l11>Area management/restriction/regulation zones and reporting units</l11> - <l12>Natural risk zones</l12> - <l13>Atmospheric conditions</l13> - <l14>Meteorological geographical features</l14> - <l15>Oceanographic geographical features</l15> - <l16>Sea regions</l16> - <l17>Bio-geographical regions</l17> - <l18>Habitats and biotopes</l18> - <l19>Species distribution</l19> - <l20>Energy resources</l20> - <l21>Mineral resources</l21> + <theme id="inspire_StatisticalUnits">Statistical units</theme> + <theme id="inspire_Buildings">Buildings</theme> + <theme id="inspire_Soil">Soil</theme> + <theme id="inspire_LandUse">Land use</theme> + <theme id="inspire_HumanHealthAndSafety">Human health and safety</theme> + <theme id="inspire_UtilityAndGovernmentServices">Utility and Government services</theme> + <theme id="inspire_EnvironmentalMonitoringFacilities">Environmental monitoring facilities</theme> + <theme id="inspire_ProductionAndIndustrialFacilities">Production and industrial facilities</theme> + <theme id="inspire_AgriculturalAndAquacultureFacilities">Agriculture and aquaculture facilities</theme> + <theme id="inspire_PopulationDistribution-Demography">Population distribution - demography</theme> + <theme id="inspire_AreaManagementRestrictionRegulationZonesAndReportingUnits">Area management/restriction/regulation zones and reporting units</theme> + <theme id="inspire_NaturalRiskZones">Natural risk zones</theme> + <theme id="inspire_AtmosphericConditions">Atmospheric conditions</theme> + <theme id="inspire_MeteorologicalGeographicalFeatures">Meteorological geographical features</theme> + <theme id="inspire_OceanographicGeographicalFeatures">Oceanographic geographical features</theme> + <theme id="inspire_SeaRegions">Sea regions</theme> + <theme id="inspire_Bio-geographicalRegions">Bio-geographical regions</theme> + <theme id="inspire_HabitatsAndBiotopes">Habitats and biotopes</theme> + <theme id="inspire_SpeciesDistribution">Species distribution</theme> + <theme id="inspire_EnergyResources">Energy resources</theme> + <theme id="inspire_MineralResources">Mineral resources</theme> </annex3> </inspire> Modified: trunk/web/src/main/webapp/loc/ca/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ca/xml/strings.xml 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/loc/ca/xml/strings.xml 2012-02-08 14:37:07 UTC (rev 8673) @@ -980,6 +980,116 @@ </searchhelp> <inspire> + <serviceType> + <value id="discovery">Discovery Service (discovery)</value> + <value id="view">View Service (view)</value> + <value id="download">Download Service (download)</value> + <value id="transformation">Transformation Service (transformation)</value> + <value id="invoke">Invoke Spatial Data Service (invoke)</value> + <value id="other">Other Services (other)</value> + </serviceType> + <spatialDataService> + <group label="Geographic human interaction services"> + <value id="humanInteractionService">Geographic human interaction services</value> + <value id="humanCatalogueViewer">Catalogue viewer</value> + <value id="humanGeographicViewer">Geographic viewer</value> + <value id="humanGeographicSpreadsheetViewer">Geographic spreadsheet viewer</value> + <value id="humanChainDefinitionEditor">Chain definition editor</value> + <value id="humanWorkflowEnactmentManager">Workflow enactment manager</value> + <value id="humanGeographicFeatureEditor">Geographic feature editor</value> + <value id="humanGeographicSymbolEditor">Geographic symbol editor</value> + <value id="humanFeatureGeneralizationEditor">Feature generalisation editor</value> + <value id="humanGeographicDataStructureViewer">Geographic data-structure viewer</value> + </group> + + <group label="Geographic model/information management service"> + <value id="infoManagementService">Geographic model/information management service</value> + <value id="infoFeatureAccessService">Feature access service</value> + <value id="infoMapAccessService">Map access service</value> + <value id="infoCoverageAccessService">Coverage access service</value> + <value id="infoSensorDescriptionService">Sensor description service</value> + <value id="infoProductAccessService">Product access service</value> + <value id="infoFeatureTypeService">Feature type service</value> + <value id="infoCatalogueService">Catalogue service</value> + <value id="infoRegistryService">Registry service</value> + <value id="infoGazetteerService">Gazetteer service</value> + <value id="infoOrderHandlingService">Order handling service</value> + <value id="infoStandingOrderService">Standing order service</value> + </group> + + <group label="Geographic workflow/task management services"> + <value id="taskManagementService">Geographic workflow/task management services</value> + <value id="chainDefinitionService">Chain definition service</value> + <value id="workflowEnactmentService">Workflow enactment service</value> + <value id="subscriptionService">Subscription service</value> + </group> + + <group label="Geographic processing services – spatial"> + <value id="spatialProcessingService">Geographic processing services – spatial</value> + <value id="spatialCoordinateConversionService">Coordinate conversion service </value> + <value id="spatialCoordinateTransformationService">Coordinate transformation service </value> + <value id="spatialCoverageVectorConversionService">Coverage/vector conversion service </value> + <value id="spatialImageCoordinateConversionService">Image coordinate conversion service</value> + <value id="spatialRectificationService">Rectification service</value> + <value id="spatialOrthorectificationService">Orthorectification service</value> + <value id="spatialSensorGeometryModelAdjustmentService">Sensor geometry model adjustment service</value> + <value id="spatialImageGeometryModelConversionService">Image geometry model conversion service</value> + <value id="spatialSubsettingService">Subsetting service</value> + <value id="spatialSamplingService">Sampling service</value> + <value id="spatialTilingChangeService">Tiling change service</value> + <value id="spatialDimensionMeasurementService">Dimension measurement service</value> + <value id="spatialFeatureManipulationService">Feature manipulation services</value> + <value id="spatialFeatureMatchingService">Feature matching service</value> + <value id="spatialFeatureGeneralizationService">Feature generalisation service</value> + <value id="spatialRouteDeterminationService">Route determination service</value> + <value id="spatialPositioningService">Positioning service</value> + <value id="spatialProximityAnalysisService">Proximity analysis service</value> + </group> + + <group label="Geographic processing services – thematic"> + <value id="thematicProcessingService">Geographic processing services – thematic</value> + <value id="thematicGoparameterCalculationService">Geoparameter calculation service</value> + <value id="thematicClassificationService">Thematic classification service</value> + <value id="thematicFeatureGeneralizationService">Feature generalisation service</value> + <value id="thematicSubsettingService">Subsetting service</value> + <value id="thematicSpatialCountingService">Spatial counting service</value> + <value id="thematicChangeDetectionService">Change detection service</value> + <value id="thematicGeographicInformationExtractionService">Geographic information extraction services</value> + <value id="thematicImageProcessingService">Image processing service</value> + <value id="thematicReducedResolutionGenerationService">Reduced resolution generation service</value> + <value id="thematicImageManipulationService">Image Manipulation Services</value> + <value id="thematicImageUnderstandingService">Image understanding services</value> + <value id="thematicImageSynthesisService">Image synthesis services</value> + <value id="thematicMultibandImageManipulationService">Multiband image manipulation</value> + <value id="thematicObjectDetectionService">Object detection service</value> + <value id="thematicGeoparsingService">Geoparsing service</value> + <value id="thematicGeocodingService">Geocoding service</value> + </group> + + <group label="Geographic processing services – temporal"> + <value id="temporalProcessingService">Geographic processing services – temporal</value> + <value id="temporalReferenceSystemTransformationService"> Temporal reference system transformation service</value> + <value id="temporalSubsettingService">Subsetting service</value> + <value id="temporalSamplingService">Sampling service</value> + <value id="temporalProximityAnalysisService">Temporal proximity analysis service</value> + </group> + + <group label="Geographic processing services – metadata"> + <value id="metadataProcessingService">Geographic processing services – metadata</value> + <value id="metadataStatisticalCalculationService">Statistical calculation service</value> + <value id="metadataGeographicAnnotationService">Geographic annotation services</value> + </group> + + <group label="Geographic communication services"> + <value id="comService">Geographic communication services</value> + <value id="comEncodingService">Encoding service</value> + <value id="comTransferService">Transfer service</value> + <value id="comGeographicCompressionService">Geographic compression service</value> + <value id="comGeographicFormatConversionService">Geographic format conversion service</value> + <value id="comMessagingService">Messaging service</value> + <value id="comRemoteFileAndExecutableManagement">Remote file and executable management</value> + </group> + </spatialDataService> <what> <l1>Opcions de cerca d'INSPIRE </l1> <l2>Metadades INSPIRE</l2> @@ -996,46 +1106,47 @@ <l13>Amaga temes INSPIRE</l13> <l14>Tema d'INSPIRE</l14> <l15>Tipus de servei</l15> + <l16>Classification of data services</l16> </what> <annex1> - <l1>Sistemes de coordenades de referència</l1> - <l2>Sistema de quadrícules geogràfiques</l2> - <l3>Noms geogràfics</l3> - <l4>Unitats administratives</l4> - <l5>Adreces</l5> - <l6>Parcel·les cadastrals</l6> - <l7>Xarxes de transport</l7> - <l8>Hidrografia</l8> - <l9>Llocs protegits</l9> + <theme id="inspire_CoordinateRefSystems">Sistemes de coordenades de referència</theme> + <theme id="inspire_GeographicalGridSystems">Sistema de quadrícules geogràfiques</theme> + <theme id="inspire_GeographicalNames">Noms geogràfics</theme> + <theme id="inspire_AdministrativeUnits">Unitats administratives</theme> + <theme id="inspire_Addresses">Adreces</theme> + <theme id="inspire_CadastralParcels">Parcel·les cadastrals</theme> + <theme id="inspire_TransportNetworks">Xarxes de transport</theme> + <theme id="inspire_Hydrography">Hidrografia</theme> + <theme id="inspire_ProtectedSites">Llocs protegits</theme> </annex1> <annex2> - <l1>Elevacions</l1> - <l2>Coberta terrestre</l2> - <l3>Ortoimatges</l3> - <l4>Geologia</l4> + <theme id="inspire_Elevation">Elevacions</theme> + <theme id="inspire_LandCover">Coberta terrestre</theme> + <theme id="inspire_Orthoimagery">Ortoimatges</theme> + <theme id="inspire_Geology">Geologia</theme> </annex2> <annex3> - <l1>Unitats estadístiques</l1> - <l2>Edificis</l2> - <l3>Sòl</l3> - <l4>Ús del sòl</l4> - <l5>Salut i seguretat humanes</l5> - <l6>Serveis d'utilitat pública i estatals</l6> - <l7>Instal·lacions d'observació del medi ambient</l7> - <l8>Instal·lacions de producció i industrials</l8> - <l9>Instal·lacions agrícoles i d'aqüicultura</l9> - <l10>Distribució de la població — demografia</l10> - <l11>Zones subjectes a ordenació, a restriccions o reglamentacions i unitats de notificació</l11> - <l12>Zones de riscos naturals</l12> - <l13>Condicions atmosfèriques</l13> - <l14>Aspectes geogràfics de caràcter meteorològic</l14> - <l15>Trets geogràfics oceanogràfics</l15> - <l16>Regions marines</l16> - <l17>Regions biogeogràfiques</l17> - <l18>Hàbitats i biòtops</l18> - <l19>Distribució de les espècies</l19> - <l20>Recursos energètics</l20> - <l21>Recursos minerals</l21> + <theme id="inspire_StatisticalUnits">Unitats estadístiques</theme> + <theme id="inspire_Buildings">Edificis</theme> + <theme id="inspire_Soil">Sòl</theme> + <theme id="inspire_LandUse">Ús del sòl</theme> + <theme id="inspire_HumanHealthAndSafety">Salut i seguretat humanes</theme> + <theme id="inspire_UtilityAndGovernmentServices">Serveis d'utilitat pública i estatals</theme> + <theme id="inspire_EnvironmentalMonitoringFacilities">Instal·lacions d'observació del medi ambient</theme> + <theme id="inspire_ProductionAndIndustrialFacilities">Instal·lacions de producció i industrials</theme> + <theme id="inspire_AgriculturalAndAquacultureFacilities">Instal·lacions agrícoles i d'aqüicultura</theme> + <theme id="inspire_PopulationDistribution-Demography">Distribució de la població — demografia</theme> + <theme id="inspire_AreaManagementRestrictionRegulationZonesAndReportingUnits">Zones subjectes a ordenació, a restriccions o reglamentacions i unitats de notificació</theme> + <theme id="inspire_NaturalRiskZones">Zones de riscos naturals</theme> + <theme id="inspire_AtmosphericConditions">Condicions atmosfèriques</theme> + <theme id="inspire_MeteorologicalGeographicalFeatures">Aspectes geogràfics de caràcter meteorològic</theme> + <theme id="inspire_OceanographicGeographicalFeatures">Trets geogràfics oceanogràfics</theme> + <theme id="inspire_SeaRegions">Regions marines</theme> + <theme id="inspire_Bio-geographicalRegions">Regions biogeogràfiques</theme> + <theme id="inspire_HabitatsAndBiotopes">Hàbitats i biòtops</theme> + <theme id="inspire_SpeciesDistribution">Distribució de les espècies</theme> + <theme id="inspire_EnergyResources">Recursos energètics</theme> + <theme id="inspire_MineralResources">Recursos minerals</theme> </annex3> </inspire> Modified: trunk/web/src/main/webapp/loc/cn/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2012-02-08 14:37:07 UTC (rev 8673) @@ -1136,6 +1136,116 @@ </searchhelp> <inspire> + <serviceType> + <value id="discovery">Discovery Service (discovery)</value> + <value id="view">View Service (view)</value> + <value id="download">Download Service (download)</value> + <value id="transformation">Transformation Service (transformation)</value> + <value id="invoke">Invoke Spatial Data Service (invoke)</value> + <value id="other">Other Services (other)</value> + </serviceType> + <spatialDataService> + <group label="Geographic human interaction services"> + <value id="humanInteractionService">Geographic human interaction services</value> + <value id="humanCatalogueViewer">Catalogue viewer</value> + <value id="humanGeographicViewer">Geographic viewer</value> + <value id="humanGeographicSpreadsheetViewer">Geographic spreadsheet viewer</value> + <value id="humanChainDefinitionEditor">Chain definition editor</value> + <value id="humanWorkflowEnactmentManager">Workflow enactment manager</value> + <value id="humanGeographicFeatureEditor">Geographic feature editor</value> + <value id="humanGeographicSymbolEditor">Geographic symbol editor</value> + <value id="humanFeatureGeneralizationEditor">Feature generalisation editor</value> + <value id="humanGeographicDataStructureViewer">Geographic data-structure viewer</value> + </group> + + <group label="Geographic model/information management service"> + <value id="infoManagementService">Geographic model/information management service</value> + <value id="infoFeatureAccessService">Feature access service</value> + <value id="infoMapAccessService">Map access service</value> + <value id="infoCoverageAccessService">Coverage access service</value> + <value id="infoSensorDescriptionService">Sensor description service</value> + <value id="infoProductAccessService">Product access service</value> + <value id="infoFeatureTypeService">Feature type service</value> + <value id="infoCatalogueService">Catalogue service</value> + <value id="infoRegistryService">Registry service</value> + <value id="infoGazetteerService">Gazetteer service</value> + <value id="infoOrderHandlingService">Order handling service</value> + <value id="infoStandingOrderService">Standing order service</value> + </group> + + <group label="Geographic workflow/task management services"> + <value id="taskManagementService">Geographic workflow/task management services</value> + <value id="chainDefinitionService">Chain definition service</value> + <value id="workflowEnactmentService">Workflow enactment service</value> + <value id="subscriptionService">Subscription service</value> + </group> + + <group label="Geographic processing services – spatial"> + <value id="spatialProcessingService">Geographic processing services – spatial</value> + <value id="spatialCoordinateConversionService">Coordinate conversion service </value> + <value id="spatialCoordinateTransformationService">Coordinate transformation service </value> + <value id="spatialCoverageVectorConversionService">Coverage/vector conversion service </value> + <value id="spatialImageCoordinateConversionService">Image coordinate conversion service</value> + <value id="spatialRectificationService">Rectification service</value> + <value id="spatialOrthorectificationService">Orthorectification service</value> + <value id="spatialSensorGeometryModelAdjustmentService">Sensor geometry model adjustment service</value> + <value id="spatialImageGeometryModelConversionService">Image geometry model conversion service</value> + <value id="spatialSubsettingService">Subsetting service</value> + <value id="spatialSamplingService">Sampling service</value> + <value id="spatialTilingChangeService">Tiling change service</value> + <value id="spatialDimensionMeasurementService">Dimension measurement service</value> + <value id="spatialFeatureManipulationService">Feature manipulation services</value> + <value id="spatialFeatureMatchingService">Feature matching service</value> + <value id="spatialFeatureGeneralizationService">Feature generalisation service</value> + <value id="spatialRouteDeterminationService">Route determination service</value> + <value id="spatialPositioningService">Positioning service</value> + <value id="spatialProximityAnalysisService">Proximity analysis service</value> + </group> + + <group label="Geographic processing services – thematic"> + <value id="thematicProcessingService">Geographic processing services – thematic</value> + <value id="thematicGoparameterCalculationService">Geoparameter calculation service</value> + <value id="thematicClassificationService">Thematic classification service</value> + <value id="thematicFeatureGeneralizationService">Feature generalisation service</value> + <value id="thematicSubsettingService">Subsetting service</value> + <value id="thematicSpatialCountingService">Spatial counting service</value> + <value id="thematicChangeDetectionService">Change detection service</value> + <value id="thematicGeographicInformationExtractionService">Geographic information extraction services</value> + <value id="thematicImageProcessingService">Image processing service</value> + <value id="thematicReducedResolutionGenerationService">Reduced resolution generation service</value> + <value id="thematicImageManipulationService">Image Manipulation Services</value> + <value id="thematicImageUnderstandingService">Image understanding services</value> + <value id="thematicImageSynthesisService">Image synthesis services</value> + <value id="thematicMultibandImageManipulationService">Multiband image manipulation</value> + <value id="thematicObjectDetectionService">Object detection service</value> + <value id="thematicGeoparsingService">Geoparsing service</value> + <value id="thematicGeocodingService">Geocoding service</value> + </group> + + <group label="Geographic processing services – temporal"> + <value id="temporalProcessingService">Geographic processing services – temporal</value> + <value id="temporalReferenceSystemTransformationService"> Temporal reference system transformation service</value> + <value id="temporalSubsettingService">Subsetting service</value> + <value id="temporalSamplingService">Sampling service</value> + <value id="temporalProximityAnalysisService">Temporal proximity analysis service</value> + </group> + + <group label="Geographic processing services – metadata"> + <value id="metadataProcessingService">Geographic processing services – metadata</value> + <value id="metadataStatisticalCalculationService">Statistical calculation service</value> + <value id="metadataGeographicAnnotationService">Geographic annotation services</value> + </group> + + <group label="Geographic communication services"> + <value id="comService">Geographic communication services</value> + <value id="comEncodingService">Encoding service</value> + <value id="comTransferService">Transfer service</value> + <value id="comGeographicCompressionService">Geographic compression service</value> + <value id="comGeographicFormatConversionService">Geographic format conversion service</value> + <value id="comMessagingService">Messaging service</value> + <value id="comRemoteFileAndExecutableManagement">Remote file and executable management</value> + </group> + </spatialDataService> <what> <l1>INSPIRE search options</l1> <l2>INSPIRE metadata</l2> @@ -1154,44 +1264,44 @@ <l15>Service type</l15> </what> <annex1> - <l1>Coordinate reference systems</l1> - <l2>Geographical grid systems</l2> - <l3>Geographical names</l3> - <l4>Administrative units</l4> - <l5>Addresses</l5> - <l6>Cadastral parcels</l6> - <l7>Transport networks</l7> - <l8>Hydrography</l8> - <l9>Protected sites</l9> + <theme id="inspire_CoordinateRefSystems">Coordinate reference systems</theme> + <theme id="inspire_GeographicalGridSystems">Geographical grid systems</theme> + <theme id="inspire_GeographicalNames">Geographical names</theme> + <theme id="inspire_AdministrativeUnits">Administrative units</theme> + <theme id="inspire_Addresses">Addresses</theme> + <theme id="inspire_CadastralParcels">Cadastral parcels</theme> + <theme id="inspire_TransportNetworks">Transport networks</theme> + <theme id="inspire_Hydrography">Hydrography</theme> + <theme id="inspire_ProtectedSites">Protected sites</theme> </annex1> <annex2> - <l1>Elevation</l1> - <l2>Land cover</l2> - <l3>Orthoimagery</l3> - <l4>Geology</l4> + <theme id="inspire_Elevation">Elevation</theme> + <theme id="inspire_LandCover">Land cover</theme> + <theme id="inspire_Orthoimagery">Orthoimagery</theme> + <theme id="inspire_Geology">Geology</theme> </annex2> <annex3> - <l1>Statistical units</l1> - <l2>Buildings</l2> - <l3>Soil</l3> - <l4>Land use</l4> - <l5>Human health and safety</l5> - <l6>Utility and Government services</l6> - <l7>Environmental monitoring facilities</l7> - <l8>Production and industrial facilities</l8> - <l9>Agriculture and aquaculture facilities</l9> - <l10>Population distribution - demography</l10> - <l11>Area management/restriction/regulation zones and reporting units</l11> - <l12>Natural risk zones</l12> - <l13>Atmospheric conditions</l13> - <l14>Meteorological geographical features</l14> - <l15>Oceanographic geographical features</l15> - <l16>Sea regions</l16> - <l17>Bio-geographical regions</l17> - <l18>Habitats and biotopes</l18> - <l19>Species distribution</l19> - <l20>Energy resources</l20> - <l21>Mineral resources</l21> + <theme id="inspire_StatisticalUnits">Statistical units</theme> + <theme id="inspire_Buildings">Buildings</theme> + <theme id="inspire_Soil">Soil</theme> + <theme id="inspire_LandUse">Land use</theme> + <theme id="inspire_HumanHealthAndSafety">Human health and safety</theme> + <theme id="inspire_UtilityAndGovernmentServices">Utility and Government services</theme> + <theme id="inspire_EnvironmentalMonitoringFacilities">Environmental monitoring facilities</theme> + <theme id="inspire_ProductionAndIndustrialFacilities">Production and industrial facilities</theme> + <theme id="inspire_AgriculturalAndAquacultureFacilities">Agriculture and aquaculture facilities</theme> + <theme id="inspire_PopulationDistribution-Demography">Population distribution - demography</theme> + <theme id="inspire_AreaManagementRestrictionRegulationZonesAndReportingUnits">Area management/restriction/regulation zones and reporting units</theme> + <theme id="inspire_NaturalRiskZones">Natural risk zones</theme> + <theme id="inspire_AtmosphericConditions">Atmospheric conditions</theme> + <theme id="inspire_MeteorologicalGeographicalFeatures">Meteorological geographical features</theme> + <theme id="inspire_OceanographicGeographicalFeatures">Oceanographic geographical features</theme> + <theme id="inspire_SeaRegions">Sea regions</theme> + <theme id="inspire_Bio-geographicalRegions">Bio-geographical regions</theme> + <theme id="inspire_HabitatsAndBiotopes">Habitats and biotopes</theme> + <theme id="inspire_SpeciesDistribution">Species distribution</theme> + <theme id="inspire_EnergyResources">Energy resources</theme> + <theme id="inspire_MineralResources">Mineral resources</theme> </annex3> </inspire> Modified: trunk/web/src/main/webapp/loc/de/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/de/xml/strings.xml 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/loc/de/xml/strings.xml 2012-02-08 14:37:07 UTC (rev 8673) @@ -1131,6 +1131,116 @@ </searchhelp> <inspire> + <serviceType> + <value id="discovery">Discovery Service (discovery)</value> + <value id="view">View Service (view)</value> + <value id="download">Download Service (download)</value> + <value id="transformation">Transformation Service (transformation)</value> + <value id="invoke">Invoke Spatial Data Service (invoke)</value> + <value id="other">Other Services (other)</value> + </serviceType> + <spatialDataService> + <group label="Geographic human interaction services"> + <value id="humanInteractionService">Geographic human interaction services</value> + <value id="humanCatalogueViewer">Catalogue viewer</value> + <value id="humanGeographicViewer">Geographic viewer</value> + <value id="humanGeographicSpreadsheetViewer">Geographic spreadsheet viewer</value> + <value id="humanChainDefinitionEditor">Chain definition editor</value> + <value id="humanWorkflowEnactmentManager">Workflow enactment manager</value> + <value id="humanGeographicFeatureEditor">Geographic feature editor</value> + <value id="humanGeographicSymbolEditor">Geographic symbol editor</value> + <value id="humanFeatureGeneralizationEditor">Feature generalisation editor</value> + <value id="humanGeographicDataStructureViewer">Geographic data-structure viewer</value> + </group> + + <group label="Geographic model/information management service"> + <value id="infoManagementService">Geographic model/information management service</value> + <value id="infoFeatureAccessService">Feature access service</value> + <value id="infoMapAccessService">Map access service</value> + <value id="infoCoverageAccessService">Coverage access service</value> + <value id="infoSensorDescriptionService">Sensor description service</value> + <value id="infoProductAccessService">Product access service</value> + <value id="infoFeatureTypeService">Feature type service</value> + <value id="infoCatalogueService">Catalogue service</value> + <value id="infoRegistryService">Registry service</value> + <value id="infoGazetteerService">Gazetteer service</value> + <value id="infoOrderHandlingService">Order handling service</value> + <value id="infoStandingOrderService">Standing order service</value> + </group> + + <group label="Geographic workflow/task management services"> + <value id="taskManagementService">Geographic workflow/task management services</value> + <value id="chainDefinitionService">Chain definition service</value> + <value id="workflowEnactmentService">Workflow enactment service</value> + <value id="subscriptionService">Subscription service</value> + </group> + + <group label="Geographic processing services – spatial"> + <value id="spatialProcessingService">Geographic processing services – spatial</value> + <value id="spatialCoordinateConversionService">Coordinate conversion service </value> + <value id="spatialCoordinateTransformationService">Coordinate transformation service </value> + <value id="spatialCoverageVectorConversionService">Coverage/vector conversion service </value> + <value id="spatialImageCoordinateConversionService">Image coordinate conversion service</value> + <value id="spatialRectificationService">Rectification service</value> + <value id="spatialOrthorectificationService">Orthorectification service</value> + <value id="spatialSensorGeometryModelAdjustmentService">Sensor geometry model adjustment service</value> + <value id="spatialImageGeometryModelConversionService">Image geometry model conversion service</value> + <value id="spatialSubsettingService">Subsetting service</value> + <value id="spatialSamplingService">Sampling service</value> + <value id="spatialTilingChangeService">Tiling change service</value> + <value id="spatialDimensionMeasurementService">Dimension measurement service</value> + <value id="spatialFeatureManipulationService">Feature manipulation services</value> + <value id="spatialFeatureMatchingService">Feature matching service</value> + <value id="spatialFeatureGeneralizationService">Feature generalisation service</value> + <value id="spatialRouteDeterminationService">Route determination service</value> + <value id="spatialPositioningService">Positioning service</value> + <value id="spatialProximityAnalysisService">Proximity analysis service</value> + </group> + + <group label="Geographic processing services – thematic"> + <value id="thematicProcessingService">Geographic processing services – thematic</value> + <value id="thematicGoparameterCalculationService">Geoparameter calculation service</value> + <value id="thematicClassificationService">Thematic classification service</value> + <value id="thematicFeatureGeneralizationService">Feature generalisation service</value> + <value id="thematicSubsettingService">Subsetting service</value> + <value id="thematicSpatialCountingService">Spatial counting service</value> + <value id="thematicChangeDetectionService">Change detection service</value> + <value id="thematicGeographicInformationExtractionService">Geographic information extraction services</value> + <value id="thematicImageProcessingService">Image processing service</value> + <value id="thematicReducedResolutionGenerationService">Reduced resolution generation service</value> + <value id="thematicImageManipulationService">Image Manipulation Services</value> + <value id="thematicImageUnderstandingService">Image understanding services</value> + <value id="thematicImageSynthesisService">Image synthesis services</value> + <value id="thematicMultibandImageManipulationService">Multiband image manipulation</value> + <value id="thematicObjectDetectionService">Object detection service</value> + <value id="thematicGeoparsingService">Geoparsing service</value> + <value id="thematicGeocodingService">Geocoding service</value> + </group> + + <group label="Geographic processing services – temporal"> + <value id="temporalProcessingService">Geographic processing services – temporal</value> + <value id="temporalReferenceSystemTransformationService"> Temporal reference system transformation service</value> + <value id="temporalSubsettingService">Subsetting service</value> + <value id="temporalSamplingService">Sampling service</value> + <value id="temporalProximityAnalysisService">Temporal proximity analysis service</value> + </group> + + <group label="Geographic processing services – metadata"> + <value id="metadataProcessingService">Geographic processing services – metadata</value> + <value id="metadataStatisticalCalculationService">Statistical calculation service</value> + <value id="metadataGeographicAnnotationService">Geographic annotation services</value> + </group> + + <group label="Geographic communication services"> + <value id="comService">Geographic communication services</value> + <value id="comEncodingService">Encoding service</value> + <value id="comTransferService">Transfer service</value> + <value id="comGeographicCompressionService">Geographic compression service</value> + <value id="comGeographicFormatConversionService">Geographic format conversion service</value> + <value id="comMessagingService">Messaging service</value> + <value id="comRemoteFileAndExecutableManagement">Remote file and executable management</value> + </group> + </spatialDataService> <what> <l1>INSPIRE search options</l1> <l2>INSPIRE metadata</l2> @@ -1147,46 +1257,47 @@ <l13>Hide INSPIRE Themes</l13> <l14>INSPIRE Theme</l14> <l15>Service type</l15> + <l16>Classification of data services</l16> </what> <annex1> - <l1>Coordinate reference systems</l1> - <l2>Geographical grid systems</l2> - <l3>Geographical names</l3> - <l4>Administrative units</l4> - <l5>Addresses</l5> - <l6>Cadastral parcels</l6> - <l7>Transport networks</l7> - <l8>Hydrography</l8> - <l9>Protected sites</l9> + <theme id="inspire_CoordinateRefSystems">Coordinate reference systems</theme> + <theme id="inspire_GeographicalGridSystems">Geographical grid systems</theme> + <theme id="inspire_GeographicalNames">Geographical names</theme> + <theme id="inspire_AdministrativeUnits">Administrative units</theme> + <theme id="inspire_Addresses">Addresses</theme> + <theme id="inspire_CadastralParcels">Cadastral parcels</theme> + <theme id="inspire_TransportNetworks">Transport networks</theme> + <theme id="inspire_Hydrography">Hydrography</theme> + <theme id="inspire_ProtectedSites">Protected sites</theme> </annex1> <annex2> - <l1>Elevation</l1> - <l2>Land cover</l2> - <l3>Orthoimagery</l3> - <l4>Geology</l4> + <theme id="inspire_Elevation">Elevation</theme> + <theme id="inspire_LandCover">Land cover</theme> + <theme id="inspire_Orthoimagery">Orthoimagery</theme> + <theme id="inspire_Geology">Geology</theme> </annex2> <annex3> - <l1>Statistical units</l1> - <l2>Buildings</l2> - <l3>Soil</l3> - <l4>Land use</l4> - <l5>Human health and safety</l5> - <l6>Utility and Government services</l6> - <l7>Environmental monitoring facilities</l7> - <l8>Production and industrial facilities</l8> - <l9>Agriculture and aquaculture facilities</l9> - <l10>Population distribution - demography</l10> - <l11>Area management/restriction/regulation zones and reporting units</l11> - <l12>Natural risk zones</l12> - <l13>Atmospheric conditions</l13> - <l14>Meteorological geographical features</l14> - <l15>Oceanographic geographical features</l15> - <l16>Sea regions</l16> - <l17>Bio-geographical regions</l17> - <l18>Habitats and biotopes</l18> - <l19>Species distribution</l19> - <l20>Energy resources</l20> - <l21>Mineral resources</l21> + <theme id="inspire_StatisticalUnits">Statistical units</theme> + <theme id="inspire_Buildings">Buildings</theme> + <theme id="inspire_Soil">Soil</theme> + <theme id="inspire_LandUse">Land use</theme> + <theme id="inspire_HumanHealthAndSafety">Human health and safety</theme> + <theme id="inspire_UtilityAndGovernmentServices">Utility and Government services</theme> + <theme id="inspire_EnvironmentalMonitoringFacilities">Environmental monitoring facilities</theme> + <theme id="inspire_ProductionAndIndustrialFacilities">Production and industrial facilities</theme> + <theme id="inspire_AgriculturalAndAquacultureFacilities">Agriculture and aquaculture facilities</theme> + <theme id="inspire_PopulationDistribution-Demography">Population distribution - demography</theme> + <theme id="inspire_AreaManagementRestrictionRegulationZonesAndReportingUnits">Area management/restriction/regulation zones and reporting units</theme> + <theme id="inspire_NaturalRiskZones">Natural risk zones</theme> + <theme id="inspire_AtmosphericConditions">Atmospheric conditions</theme> + <theme id="inspire_MeteorologicalGeographicalFeatures">Meteorological geographical features</theme> + <theme id="inspire_OceanographicGeographicalFeatures">Oceanographic geographical features</theme> + <theme id="inspire_SeaRegions">Sea regions</theme> + <theme id="inspire_Bio-geographicalRegions">Bio-geographical regions</theme> + <theme id="inspire_HabitatsAndBiotopes">Habitats and biotopes</theme> + <theme id="inspire_SpeciesDistribution">Species distribution</theme> + <theme id="inspire_EnergyResources">Energy resources</theme> + <theme id="inspire_MineralResources">Mineral resources</theme> </annex3> </inspire> Modified: trunk/web/src/main/webapp/loc/en/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/en/xml/strings.xml 2012-02-07 21:59:32 UTC (rev 8672) +++ trunk/web/src/main/webapp/loc/en/xml/strings.xml 2012-02-08 14:37:07 UTC (rev 8673) @@ -1149,6 +1149,121 @@ </searchhelp> <inspire> + <serviceType> + <value id="discovery">Discovery Service (discovery)</value> + <value id="view">View Service (view)</value> + <value id="download">Download Service (download)</value> + <value id="transformation">Transformation Service (transformation)</value> + <value id="invoke">Invoke Spatial Data Service (invoke)</value> + <value id="other">Other Services (other)</value> + </serviceType> + <spatialDataService> + <group label="Geographic human interaction services"> + <value id="humanInteractionService">Geographic human interaction services</value> + <value id="humanCatalogueViewer">Catalogue viewer</value> + <value id="humanGeographicViewer">Geographic viewer</value> + <value id="humanGeographicSpreadsheetViewer">Geographic spreadsheet viewer</value> + <value id="humanChainDefinitionEditor">Chain definition editor</value> + <value id="humanWorkflowEnactmentManager">Workflow enactment manager</value> + <value id="humanGeographicFeatureEditor">Geograph... [truncated message content] |