Skip to content

Commit

Permalink
Merge pull request #8 from gdi-be/implement-iso-generation
Browse files Browse the repository at this point in the history 
Implement ISO generation (datasets)
  • Loading branch information
@hwbllmnn
hwbllmnn authored Dec 20, 2024
2 parents 87cbb0a + f29b906 commit c613211
Show file tree
Hide file tree
Showing 14 changed files with 690 additions and 150 deletions.
151 changes: 76 additions & 75 deletions mde-importer/src/main/java/de/terrestris/mde/mde_importer/importer/ImportService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,20 @@
import java.util.stream.Stream;

import static de.terrestris.mde.mde_backend.model.json.JsonIsoMetadata.InspireTheme.*;
import static de.terrestris.mde.mde_backend.utils.NamespaceUtils.XLINK;
import static de.terrestris.utils.xml.XmlUtils.*;

@Component
@Log4j2
public class ImportService {

private static final String XLINK = "http://www.w3.org/1999/xlink";

private static final Pattern ID_REGEXP = Pattern.compile(".*/([^/]+)");

private static final XMLInputFactory FACTORY = XMLInputFactory.newFactory();

private static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd");

private static final Map<String, JsonIsoMetadata.InspireTheme> INSPIRE_THEME_MAP;
public static final Map<String, JsonIsoMetadata.InspireTheme> INSPIRE_THEME_MAP;

static {
INSPIRE_THEME_MAP = new HashMap<>();
Expand Down Expand Up @@ -185,10 +184,15 @@ private void parseDatasetMetadata(XMLStreamReader reader) throws XMLStreamExcept
skipToElement(reader, "CharacterString");
json.setFileIdentifier(reader.getElementText());
skipToElement(reader, "contact");
parseContact(reader, json, "contact");
var contact = parseContact(reader, "contact");
if (json.getContacts() == null) {
json.setContacts(new ArrayList<>());
}
json.getContacts().add(contact);
skipToElement(reader, "dateStamp");
skipToElement(reader, "DateTime");
json.setDateTime(Instant.parse(reader.getElementText() + "Z"));
extractCoordinateSystem(reader, json);
extractFromIso(reader, metadata, json, client, technical);
var list = servicesMap.get(metadata.getMetadataId());
if (list != null) {
Expand All @@ -199,6 +203,20 @@ private void parseDatasetMetadata(XMLStreamReader reader) throws XMLStreamExcept
technicalMetadataRepository.save(technical);
}

private static void extractCoordinateSystem(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException {
while (reader.hasNext() && !(reader.isStartElement() && reader.getLocalName().equals("identificationInfo"))) {
reader.next();
if (!reader.isStartElement()) {
continue;
}
if (reader.getLocalName().equals("referenceSystemInfo")) {
skipToElement(reader, "code");
skipToElement(reader, "CharacterString");
json.setCrs(reader.getElementText());
}
}
}

private static void extractFromIso(XMLStreamReader reader, IsoMetadata metadata, JsonIsoMetadata json, ClientMetadata client, TechnicalMetadata technical) throws XMLStreamException, ParseException {
json.setResourceConstraints(new ArrayList<>());
skipToElement(reader, "MD_DataIdentification");
Expand All @@ -210,12 +228,21 @@ private static void extractFromIso(XMLStreamReader reader, IsoMetadata metadata,
if (!reader.isStartElement()) {
continue;
}
if (reader.isStartElement() && reader.getLocalName().equals("identifier")) {
skipToElement(reader, "CharacterString");
json.setIdentifier(reader.getElementText());
}
if (reader.isStartElement() && reader.getLocalName().equals("abstract")) {
skipToElement(reader, "CharacterString");
json.setDescription(reader.getElementText());
}
if (reader.isStartElement() && reader.getLocalName().equals("pointOfContact")) {
parseContact(reader, json, "pointOfContact");
var contact = parseContact(reader, "pointOfContact");
json.setPointOfContact(contact);
}
if (reader.isStartElement() && reader.getLocalName().equals("topicCategory")) {
skipToElement(reader, "MD_TopicCategoryCode");
json.setTopicCategory(reader.getElementText());
}
if (reader.isStartElement() && reader.getLocalName().equals("graphicOverview")) {
skipToElement(reader, "CharacterString");
Expand All @@ -234,7 +261,6 @@ private static void extractFromIso(XMLStreamReader reader, IsoMetadata metadata,
extractExtent(reader, json);
extractSpatialResolution(reader, json);
extractGraphicOverview(reader, json);
extractCitation(reader, json);
extractTransferOptions(reader, json);
extractResourceConstraints(reader, json);
extractDistributionFormat(reader, json);
Expand Down Expand Up @@ -353,31 +379,6 @@ private static void extractConformanceResult(XMLStreamReader reader, JsonIsoMeta
}
}

private static void extractCitation(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException, ParseException {
if (reader.isStartElement() && reader.getLocalName().equals("citation")) {
while (reader.hasNext() && !(reader.isEndElement() && reader.getLocalName().equals("citation"))) {
var citation = new Citation();
json.setCitation(citation);
reader.next();
if (!reader.isStartElement()) {
continue;
}
if (reader.getLocalName().equals("title")) {
skipToElement(reader, "CharacterString");
citation.setTitle(reader.getElementText());
}
if (reader.getLocalName().equals("Date")) {
var date = FORMAT.parse(reader.getElementText()).toInstant();
citation.setDate(date);
}
if (reader.getLocalName().equals("code")) {
skipToElement(reader, "CharacterString");
citation.setUrl(reader.getElementText());
}
}
}
}

private static void extractSpatialResolution(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException {
if (reader.isStartElement() && reader.getLocalName().equals("spatialResolution")) {
while (reader.hasNext() && !(reader.isEndElement() && reader.getLocalName().equals("spatialResolution"))) {
Expand All @@ -386,7 +387,10 @@ private static void extractSpatialResolution(XMLStreamReader reader, JsonIsoMeta
continue;
}
if (reader.getLocalName().equals("Distance")) {
json.setResolution(Double.parseDouble(reader.getElementText()));
if (json.getResolutions() == null) {
json.setResolutions(new ArrayList<>());
}
json.getResolutions().add(Double.parseDouble(reader.getElementText()));
}
if (reader.getLocalName().equals("denominator")) {
skipToElement(reader, "Integer");
Expand All @@ -411,92 +415,89 @@ private static void extractTransferOptions(XMLStreamReader reader, JsonIsoMetada
String url = reader.getElementText();
skipToElement(reader, "CharacterString");
String text = reader.getElementText();
json.getContentDescriptions().add(new ContentDescription(url, text));
skipToElement(reader, "CI_OnLineFunctionCode");
String code = reader.getAttributeValue(null, "codeListValue");
json.getContentDescriptions().add(new ContentDescription(url, text, CI_OnLineFunctionCode.valueOf(code)));
}
}
}
}

private static void extractResourceConstraints(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException {
if (reader.isStartElement() && reader.getLocalName().equals("resourceConstraints")) {
ResourceConstraints resourceConstraints = new ResourceConstraints();
resourceConstraints.setConstraints(new ArrayList<>());
var list = new ArrayList<Constraint>();
json.getResourceConstraints().add(list);
while (!(reader.isEndElement() && reader.getLocalName().equals("resourceConstraints"))) {
reader.next();
if (!reader.isStartElement()) {
if (!reader.isStartElement() || reader.getLocalName().equals("MD_LegalConstraints") ||
reader.getLocalName().equals("useLimitation") || reader.getLocalName().equals("CharacterString")) {
continue;
}
var constraint = new Constraint();
list.add(constraint);
constraint.setType(Constraint.ConstraintType.valueOf(reader.getLocalName()));
skipToOneOf(reader, "Anchor", "CharacterString", "MD_RestrictionCode");
switch (reader.getLocalName()) {
case "accessConstraints":
case "otherConstraints":
case "useConstraints":
do {
reader.next();
} while (!reader.isStartElement());
Constraint constraint = new Constraint();
resourceConstraints.getConstraints().add(constraint);
switch (reader.getLocalName()) {
case "MD_RestrictionCode":
constraint.setRestrictionCode(MD_RestrictionCode.valueOf(reader.getAttributeValue(null, "codeListValue")));
break;
case "Anchor":
constraint.setUrl(reader.getAttributeValue(XLINK, "href"));
constraint.setText(reader.getElementText());
break;
case "CharacterString":
constraint.setText(reader.getElementText());
break;
}
case "MD_RestrictionCode":
constraint.setRestrictionCode(MD_RestrictionCode.valueOf(reader.getAttributeValue(null, "codeListValue")));
break;
case "Anchor":
constraint.setNamespace(reader.getAttributeValue(XLINK, "href"));
constraint.setText(reader.getElementText());
break;
case "CharacterString":
constraint.setText(reader.getElementText());
break;
}
}
json.getResourceConstraints().add(resourceConstraints);
}
}

private static void extractKeyword(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException {
if (json.getKeywords() == null) {
json.setKeywords(new ArrayList<>());
}
private static void extractKeyword(XMLStreamReader reader, JsonIsoMetadata json) throws XMLStreamException, ParseException {
if (reader.isStartElement() && reader.getLocalName().equals("MD_Keywords")) {
var keyword = new Keyword();
json.getKeywords().add(keyword);
var keywords = new ArrayList<Keyword>();
var thesaurus = new Thesaurus();
while (reader.hasNext() && !(reader.isEndElement() && reader.getLocalName().equals("MD_Keywords"))) {
reader.next();
if (!reader.isStartElement()) {
continue;
}
switch (reader.getLocalName()) {
case "keyword":
if (keyword.getKeyword() != null) {
keyword = new Keyword();
json.getKeywords().add(keyword);
}
skipToOneOf(reader, "CharacterString", "Anchor");
if (reader.getLocalName().equals("CharacterString")) {
keyword.setKeyword(reader.getElementText());
keywords.add(new Keyword(null, reader.getElementText()));
} else {
var keyword = new Keyword();
keyword.setNamespace(reader.getAttributeValue(XLINK, "href"));
keyword.setKeyword(reader.getElementText());
keywords.add(keyword);
}
break;
case "thesaurusName":
skipToOneOf(reader, "CharacterString", "Anchor");
if (reader.getLocalName().equals("CharacterString")) {
keyword.setThesaurus(reader.getElementText());
thesaurus.setTitle(reader.getElementText());
} else {
keyword.setThesaurusNamespace(reader.getAttributeValue(XLINK, "href"));
keyword.setThesaurus(reader.getElementText());
thesaurus.setNamespace(reader.getAttributeValue(XLINK, "href"));
thesaurus.setTitle(reader.getElementText());
}
skipToElement(reader, "Date");
thesaurus.setDate(FORMAT.parse(reader.getElementText()).toInstant());
skipToElement(reader, "CI_DateTypeCode");
thesaurus.setCode(CI_DateTypeCode.valueOf(reader.getAttributeValue(null, "codeListValue")));
break;
}
}
if (keyword.getThesaurus() != null && keyword.getThesaurus().equals("GEMET - INSPIRE themes, version 1.0")) {
json.setInspireTheme(INSPIRE_THEME_MAP.get(keyword.getKeyword()));
json.getKeywords().put(thesaurus.getTitle() == null ? "default" : thesaurus.getTitle(), keywords);
json.getThesauri().put(thesaurus.getTitle() == null ? "default" : thesaurus.getTitle(), thesaurus);
if (thesaurus.getTitle() != null && thesaurus.getTitle().equals("GEMET - INSPIRE themes, version 1.0")) {
json.setInspireTheme(INSPIRE_THEME_MAP.get(keywords.getFirst().getKeyword()));
}
}
}

private static void parseContact(XMLStreamReader reader, JsonIsoMetadata json, String elementName) throws XMLStreamException {
private static Contact parseContact(XMLStreamReader reader, String elementName) throws XMLStreamException {
var contact = new Contact();
while (reader.hasNext() && !(reader.isEndElement() && reader.getLocalName().equals(elementName))) {
reader.next();
Expand Down Expand Up @@ -527,7 +528,7 @@ private static void parseContact(XMLStreamReader reader, JsonIsoMetadata json, S
break;
}
}
json.getContacts().add(contact);
return contact;
}

private void addService(Path file, JsonIsoMetadata json, JsonClientMetadata clientMetadata, JsonTechnicalMetadata technical) {
Expand Down
20 changes: 20 additions & 0 deletions ...ervices/src/main/java/de/terrestris/mde/mde_backend/controller/IsoMetadataController.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package de.terrestris.mde.mde_backend.controller;

import de.terrestris.mde.mde_backend.model.IsoMetadata;
import de.terrestris.mde.mde_backend.service.IsoGenerator;
import de.terrestris.mde.mde_backend.service.IsoMetadataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
Expand All @@ -14,12 +15,26 @@
import org.springframework.web.server.ResponseStatusException;

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.xml.stream.XMLStreamException;
import java.io.IOException;

import static org.springframework.http.HttpStatus.OK;

@Log4j2
@RestController
@RequestMapping("/metadata/iso")
public class IsoMetadataController extends BaseMetadataController<IsoMetadataService, IsoMetadata> {

@Autowired
private IsoGenerator isoGenerator;

@GetMapping(
path = "/search",
produces = {
Expand Down Expand Up @@ -59,5 +74,10 @@ public List<IsoMetadata> search(@RequestParam String searchTerm, @RequestParam(r
}
}

@GetMapping(path = "/generate/{id}")
public ResponseEntity<String> generateIsoMetadata(@PathVariable("id") String id) throws XMLStreamException, IOException {
isoGenerator.generateMetadata(id);
return new ResponseEntity<>(OK);
}

}
7 changes: 7 additions & 0 deletions mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/CI_DateTypeCode.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package de.terrestris.mde.mde_backend.model.json;

public enum CI_DateTypeCode {
creation,
publication,
revision
}
10 changes: 9 additions & 1 deletion mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Constraint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@
@AllArgsConstructor
public class Constraint {

private String url;
public enum ConstraintType {
accessConstraints,
useConstraints,
otherConstraints
}

private String namespace;

private String text;

private MD_RestrictionCode restrictionCode;

private ConstraintType type;

}
2 changes: 2 additions & 0 deletions mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/ContentDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ public class ContentDescription {

private String description;

private CI_OnLineFunctionCode code;

}
20 changes: 0 additions & 20 deletions mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/DataIdentificator.java
View file

This file was deleted.

Loading

0 comments on commit c613211

Please sign in to comment.