Add method getnamespaceAndTag to GFPDStructElem.

Fix getcircularMappingExist method
veraPDF · Jun 5, 2024 · b8c8f07 · b8c8f07
1 parent 6c18b0e
commit b8c8f07
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java
@@ -39,9 +39,11 @@
 import org.verapdf.model.coslayer.CosUnicodeName;
 import org.verapdf.model.pdlayer.PDStructElem;
 import org.verapdf.pd.structure.StructureType;
+import org.verapdf.pdfa.flavours.PDFAFlavour;
 import org.verapdf.pdfa.flavours.PDFFlavours;
 import org.verapdf.tools.StaticResources;
 import org.verapdf.tools.TaggedPDFConstants;
+import org.verapdf.tools.TaggedPDFHelper;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -121,6 +123,15 @@ public String getparentStandardType() {
 		return null;
 	}
 
+	@Override
+	public String getnamespaceAndTag() {
+		StructureType type = ((org.verapdf.pd.structure.PDStructElem)simplePDObject).getStructureType();
+		if (type != null) {
+			return (type.getType() != null ? type.getType() : "null") + ":" + (type.getNameSpaceURI() != null ? type.getNameSpaceURI() : "null");
+		}
+		return null;
+	}
+
 	@Override
 	public Boolean getcontainsParent() {
 		return ((org.verapdf.pd.structure.PDStructElem) simplePDObject).getParent() != null;
@@ -193,7 +204,17 @@ public String getE() {
 	@Override
 	public Boolean getcircularMappingExist() {
 		StructureType type = ((org.verapdf.pd.structure.PDStructElem)simplePDObject).getStructureType();
-		return type != null ? StaticResources.getRoleMapHelper().circularMappingExist(type.getType()) : null;
+		if (type != null) {
+			if (StaticResources.getRoleMapHelper().circularMappingExist(type.getType())) {
+				return true;
+			}
+			if (PDFFlavours.isPDFSpecification(StaticContainers.getFlavour(), PDFAFlavour.PDFSpecification.ISO_32000_2_0) && 
+					TaggedPDFHelper.isCircularMappingExist(type)) {
+				return true;
+			}
+			return false;
+		}
+		return null;
 	}
 
 	@Override