Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for OGC API - Features Retriever #52

Merged
merged 12 commits into from
Nov 16, 2023
Merged

Add support for OGC API - Features Retriever #52

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
064c1fb
Implement OGCAPI_Features DatasourceType for georesource import
SpeckiJ Oct 24, 2023
5d9662e
add CRS parameter to OGC-API - Features converter
SpeckiJ Oct 30, 2023
6994bcc
fix mapping import + respect `mandatory` parameter flag
SpeckiJ Oct 30, 2023
0e9dc99
add ogc-api features datasource/converter for spatialUnits
SpeckiJ Oct 30, 2023
0fda4cc
fix selection of datasources during import
SpeckiJ Oct 31, 2023
67aa051
Merge remote-tracking branch 'origin/master' into feature/ogcapi_feat…
SpeckiJ Nov 13, 2023
c4f14ca
fix broken layout when adding spatialResource
SpeckiJ Nov 14, 2023
7442f0a
fix mapping import for OGC API Features datasource
SpeckiJ Nov 14, 2023
cdeb242
implement OGC API - Features support for editGeoresource & editSpatia…
SpeckiJ Nov 14, 2023
6b7b4d2
fix broken file upload when adding spatialUnits
SpeckiJ Nov 15, 2023
e7c8e08
fix datasource selection dialog showing incorrect values
SpeckiJ Nov 15, 2023
e4f7b95
fix import of bbox for ogc-api features datasource
SpeckiJ Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
289 changes: 170 additions & 119 deletions ...rAdmin/adminGeoresourcesManagement/georesourceAddModal/georesource-add-modal.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,28 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
$scope.converter = undefined;
$scope.schema = undefined;
$scope.mimeType = undefined;
$scope.datasourceType = undefined;
$scope.georesourceDataSourceIdProperty = undefined;
$scope.georesourceDataSourceNameProperty = undefined;
$scope.datasourceType = undefined;
$scope.georesourceDataSourceIdProperty = undefined;
$scope.georesourceDataSourceNameProperty = undefined;

$scope.converterDefinition = undefined;
$scope.datasourceTypeDefinition = undefined;
$scope.propertyMappingDefinition = undefined;
$scope.postBody_georesources = undefined;
$scope.availableDatasourceTypes = [];
$scope.availableSpatialUnits = undefined;

$scope.validityEndDate_perFeature = undefined;
$scope.validityStartDate_perFeature = undefined;
$scope.converterDefinition = undefined;
$scope.datasourceTypeDefinition = undefined;
$scope.propertyMappingDefinition = undefined;
$scope.postBody_georesources = undefined;

$scope.attributeMapping_sourceAttributeName = undefined;
$scope.attributeMapping_destinationAttributeName = undefined;
$scope.attributeMapping_data = undefined;
$scope.attributeMapping_attributeType = kommonitorImporterHelperService.attributeMapping_attributeTypes[0];
$scope.attributeMappings_adminView = [];
$scope.keepAttributes = true;
$scope.keepMissingValues = true;
$scope.validityEndDate_perFeature = undefined;
$scope.validityStartDate_perFeature = undefined;

$scope.attributeMapping_sourceAttributeName = undefined;
$scope.attributeMapping_destinationAttributeName = undefined;
$scope.attributeMapping_data = undefined;
$scope.attributeMapping_attributeType = kommonitorImporterHelperService.attributeMapping_attributeTypes[0];
$scope.attributeMappings_adminView = [];
$scope.keepAttributes = true;
$scope.keepMissingValues = true;

$scope.successMessagePart = undefined;
$scope.errorMessagePart = undefined;
Expand Down Expand Up @@ -215,7 +218,6 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
},1000);



// initialize colorPickers
$('#loiColorPicker').colorpicker();
$('#aoiColorPicker').colorpicker();
Expand Down Expand Up @@ -276,6 +278,9 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
$scope.georesourceDataSourceIdProperty = undefined;
$scope.georesourceDataSourceNameProperty = undefined;

$scope.availableDatasourceTypes = [];
$scope.availableSpatialUnits = undefined;

$scope.converterDefinition = undefined;
$scope.datasourceTypeDefinition = undefined;
$scope.propertyMappingDefinition = undefined;
Expand All @@ -295,16 +300,46 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
$scope.keepAttributes = true;
$scope.keepMissingValues = true;

$scope.onChangeConverter();
$scope.onChangeDatasourceType();

setTimeout(() => {
$scope.$digest();
}, 250);
};

$scope.onChangeConverter = function(){
$scope.schema = $scope.converter.schemas ? $scope.converter.schemas[0] : undefined;
$scope.mimeType = $scope.converter.mimeTypes[0];
if ($scope.converter) {
$scope.schema = $scope.converter.schemas ? $scope.converter.schemas[0] : undefined;
$scope.mimeType = $scope.converter.mimeTypes[0];

// update available datasourcetypes for this specific converter
$scope.availableDatasourceTypes = [];
for(var datasourceType of kommonitorImporterHelperService.availableDatasourceTypes){
for(var availableType of $scope.converter.datasources) {
if (datasourceType.type === availableType){
$scope.availableDatasourceTypes.push(datasourceType);
}
}
}

if ($scope.availableDatasourceTypes.length == 1) {
$scope.datasourceType = $scope.availableDatasourceTypes[0];
$scope.onChangeDatasourceType();
}
}
};

$scope.onChangeDatasourceType = function(ds){
if ($scope.datasourceType && $scope.datasourceType.type == "OGCAPI_FEATURES") {
$scope.availableSpatialUnits = [ ...kommonitorDataExchangeService.availableSpatialUnits_map.values() ]
// console.log($scope.availableSpatialUnits)
}
};

$scope.onChangeConverter();
$scope.onChangeDatasourceType();

$scope.onChangeMimeType = function(mimeType){
$scope.mimeType = mimeType;
};
Expand Down Expand Up @@ -570,10 +605,7 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
return;
}
else {


// TODO verify input

// TODO Create and perform POST Request with loading screen

var newGeoresourceResponse_dryRun = undefined;
Expand Down Expand Up @@ -961,7 +993,7 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
$scope.parseFromMappingConfigFile = function(event){
$scope.mappingConfigImportSettings = JSON.parse(event.target.result);

if(! $scope.mappingConfigImportSettings.converter || ! $scope.mappingConfigImportSettings.dataSource || ! $scope.mappingConfigImportSettings.propertyMapping){
if(! $scope.mappingConfigImportSettings.converter || ! $scope.mappingConfigImportSettings.dataSource || ! $scope.mappingConfigImportSettings.propertyMapping) {
console.error("uploaded MappingConfig File cannot be parsed - wrong structure.");
$scope.georesourceMetadataImportError = "Struktur der Datei stimmt nicht mit erwartetem Muster überein.";
document.getElementById("georesourcesAddMappingConfigPre").innerHTML = $scope.georesourceMappingConfigStructure_pretty;
Expand All @@ -970,96 +1002,115 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
$scope.$digest();
}

$scope.converter = undefined;
$scope.converter = undefined;
for(var converter of kommonitorImporterHelperService.availableConverters){
if (converter.name === $scope.mappingConfigImportSettings.converter.name){
$scope.converter = converter;
break;
}
}
}

$scope.schema = undefined;
if ($scope.converter && $scope.converter.schemas && $scope.mappingConfigImportSettings.converter.schema){
for (var schema of $scope.converter.schemas) {
if (schema === $scope.mappingConfigImportSettings.converter.schema){
$scope.schema = schema;
}
}
}

$scope.mimeType = undefined;
if ($scope.converter && $scope.converter.mimeTypes && $scope.mappingConfigImportSettings.converter.mimeType){
for (var mimeType of $scope.converter.mimeTypes) {
if (mimeType === $scope.mappingConfigImportSettings.converter.mimeType){
$scope.mimeType = mimeType;
}
}
}

$scope.datasourceType = undefined;
for(var datasourceType of kommonitorImporterHelperService.availableDatasourceTypes){
if (datasourceType.type === $scope.mappingConfigImportSettings.dataSource.type){
$scope.datasourceType = datasourceType;
break;
}
}

$scope.$digest();

// converter parameters
if ($scope.converter){
for (var convParameter of $scope.mappingConfigImportSettings.converter.parameters) {
$("#converterParameter_georesourceAdd_" + convParameter.name).val(convParameter.value);
}
}

// datasourceTypes parameters
if ($scope.datasourceType){
for (var dsParameter of $scope.mappingConfigImportSettings.dataSource.parameters) {
$("#datasourceTypeParameter_georesourceAdd_" + dsParameter.name).val(dsParameter.value);
}
}

// property Mapping
$scope.georesourceDataSourceNameProperty = $scope.mappingConfigImportSettings.propertyMapping.nameProperty;
$scope.georesourceDataSourceIdProperty = $scope.mappingConfigImportSettings.propertyMapping.identifierProperty;
$scope.validityStartDate_perFeature = $scope.mappingConfigImportSettings.propertyMapping.validStartDateProperty;
$scope.validityEndDate_perFeature = $scope.mappingConfigImportSettings.propertyMapping.validEndDateProperty;
$scope.keepAttributes = $scope.mappingConfigImportSettings.propertyMapping.keepAttributes;
$scope.keepMissingValues = $scope.mappingConfigImportSettings.propertyMapping.keepMissingOrNullValueAttributes;
$scope.attributeMappings_adminView = [];

for (var attributeMapping of $scope.mappingConfigImportSettings.propertyMapping.attributes) {
var tmpEntry = {
"sourceName": attributeMapping.name,
"destinationName": attributeMapping.mappingName
};

for (const dataType of kommonitorImporterHelperService.attributeMapping_attributeTypes) {
if (dataType.apiName === attributeMapping.type){
tmpEntry.dataType = dataType;
}
}

$scope.attributeMappings_adminView.push(tmpEntry);
}

if ($scope.mappingConfigImportSettings.periodOfValidity){
$scope.periodOfValidity = {};
$scope.periodOfValidity.startDate = $scope.mappingConfigImportSettings.periodOfValidity.startDate;
$scope.periodOfValidity.endDate = $scope.mappingConfigImportSettings.periodOfValidity.endDate;
$scope.periodOfValidityInvalid = false;

// update datePickers
if ($scope.periodOfValidity.startDate){
$("#georesourceAddDatepickerStart").datepicker('setDate', $scope.periodOfValidity.startDate);
}
if ($scope.periodOfValidity.endDate){
$("#georesourceAddDatepickerEnd").datepicker('setDate', $scope.periodOfValidity.endDate);
}
}

$scope.$digest();
if ($scope.converter && $scope.converter.schemas && $scope.mappingConfigImportSettings.converter.schema){
for (var schema of $scope.converter.schemas) {
if (schema === $scope.mappingConfigImportSettings.converter.schema){
$scope.schema = schema;
}
}
}

$scope.mimeType = undefined;
if ($scope.converter && $scope.converter.mimeTypes && $scope.mappingConfigImportSettings.converter.mimeType){
for (var mimeType of $scope.converter.mimeTypes) {
if (mimeType === $scope.mappingConfigImportSettings.converter.mimeType){
$scope.mimeType = mimeType;
}
}
}

$scope.datasourceType = undefined;
for(var availableType of $scope.converter.datasources) {
for (var datasourceType of kommonitorImporterHelperService.availableDatasourceTypes) {
if (datasourceType.type === availableType){
$scope.availableDatasourceTypes.push(datasourceType);
if ($scope.mappingConfigImportSettings.dataSource.type === availableType) {
$scope.datasourceType = $scope.mappingConfigImportSettings.dataSource;
}
break;
}
}
}

$scope.onChangeConverter();
$scope.$digest();

// converter parameters
if ($scope.converter){
for (var convParameter of $scope.mappingConfigImportSettings.converter.parameters) {
$("#converterParameter_georesourceAdd_" + convParameter.name).val(convParameter.value);
}
}

// datasourceTypes parameters
if ($scope.datasourceType){
for (var dsParameter of $scope.mappingConfigImportSettings.dataSource.parameters) {
if (dsParameter.name === "bbox") {
if ($("#datasourceTypeParameter_georesourceAdd_bboxType").val() == "ref") {
$scope.bboxType = "ref";
$("#datasourceTypeParameter_georesourceAdd_bboxRef").val(dsParameter.value)
} else {
bbox = dsParameter.value.split(',');
$("#datasourceTypeParameter_georesourceAdd_bbox_minx").val(bbox[0])
$("#datasourceTypeParameter_georesourceAdd_bbox_miny").val(bbox[1])
$("#datasourceTypeParameter_georesourceAdd_bbox_maxx").val(bbox[2])
$("#datasourceTypeParameter_georesourceAdd_bbox_maxy").val(bbox[3])
}
} else {
$("#datasourceTypeParameter_georesourceAdd_" + dsParameter.name).val(dsParameter.value);
}
}
}

// property Mapping
$scope.georesourceDataSourceNameProperty = $scope.mappingConfigImportSettings.propertyMapping.nameProperty;
$scope.georesourceDataSourceIdProperty = $scope.mappingConfigImportSettings.propertyMapping.identifierProperty;
$scope.validityStartDate_perFeature = $scope.mappingConfigImportSettings.propertyMapping.validStartDateProperty;
$scope.validityEndDate_perFeature = $scope.mappingConfigImportSettings.propertyMapping.validEndDateProperty;
$scope.keepAttributes = $scope.mappingConfigImportSettings.propertyMapping.keepAttributes;
$scope.keepMissingValues = $scope.mappingConfigImportSettings.propertyMapping.keepMissingOrNullValueAttributes;
$scope.attributeMappings_adminView = [];

for (var attributeMapping of $scope.mappingConfigImportSettings.propertyMapping.attributes) {
var tmpEntry = {
"sourceName": attributeMapping.name,
"destinationName": attributeMapping.mappingName
};

for (const dataType of kommonitorImporterHelperService.attributeMapping_attributeTypes) {
if (dataType.apiName === attributeMapping.type){
tmpEntry.dataType = dataType;
}
}

$scope.attributeMappings_adminView.push(tmpEntry);
}

if ($scope.mappingConfigImportSettings.periodOfValidity){
$scope.periodOfValidity = {};
$scope.periodOfValidity.startDate = $scope.mappingConfigImportSettings.periodOfValidity.startDate;
$scope.periodOfValidity.endDate = $scope.mappingConfigImportSettings.periodOfValidity.endDate;
$scope.periodOfValidityInvalid = false;

// update datePickers
if ($scope.periodOfValidity.startDate){
$("#georesourceAddDatepickerStart").datepicker('setDate', $scope.periodOfValidity.startDate);
}
if ($scope.periodOfValidity.endDate){
$("#georesourceAddDatepickerEnd").datepicker('setDate', $scope.periodOfValidity.endDate);
}
}

$scope.$digest();
};

$scope.onExportGeoresourceAddMappingConfig = async function(){
Expand Down Expand Up @@ -1103,23 +1154,23 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {



$scope.hideSuccessAlert = function(){
$("#georesourceAddSuccessAlert").hide();
};
$scope.hideSuccessAlert = function(){
$("#georesourceAddSuccessAlert").hide();
};

$scope.hideErrorAlert = function(){
$("#georesourceAddErrorAlert").hide();
};
$scope.hideErrorAlert = function(){
$("#georesourceAddErrorAlert").hide();
};

$scope.hideMetadataErrorAlert = function(){
$("#georesourceMetadataImportErrorAlert").hide();
};
$scope.hideMetadataErrorAlert = function(){
$("#georesourceMetadataImportErrorAlert").hide();
};

$scope.hideMappingConfigErrorAlert = function(){
$("#georesourceMappingConfigImportErrorAlert").hide();
};
$scope.hideMappingConfigErrorAlert = function(){
$("#georesourceMappingConfigImportErrorAlert").hide();
};

kommonitorMultiStepFormHelperService.registerClickHandler();
kommonitorMultiStepFormHelperService.registerClickHandler();

}
]});
Loading
Loading