Re-organize Geopriv CivicAddress (af2a20dc) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

ttcn/LibEmcom/LibNg112/xsd/RFC4119_geopriv10_civiloc.xsd

+62 −45

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<?xml version="1.0"?>
		<xs:schema
		targetNamespace="urn:ietf:params:xml:ns:pidf:geopriv10:civicLoc"
		xmlns:tns="urn:ietf:params:xml:ns:pidf:geopriv10:civicLoc"
		targetNamespace="urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr"
		xmlns:xs="http://www.w3.org/2001/XMLSchema"
		xmlns:ca="urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr"
		xmlns:xml="http://www.w3.org/XML/1998/namespace"
		elementFormDefault="qualified" attributeFormDefault="unqualified">

		<xs:import namespace="http://www.w3.org/XML/1998/namespace"
		schemaLocation="http://www.w3.org/2001/xml.xsd"/>

		<xs:simpleType name="iso3166a2">
		<xs:restriction base="xs:token">
		<xs:pattern value="[A-Z]{2}"/>
		</xs:restriction>
		</xs:simpleType>

		<xs:complexType name="caType">
		<xs:simpleContent>
		<xs:extension base="xs:token">
		<xs:attribute ref="xml:lang" use="optional"/>
		</xs:extension>
		</xs:simpleContent>
		</xs:complexType>
		<xs:element name="civicAddress" type="ca:civicAddress"/>
		<xs:complexType name="civicAddress">
		<xs:sequence>
		<xs:element name="country" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A1" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A2" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A3" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A4" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A5" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="A6" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="PRD" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="POD" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="STS" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="HNO" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="HNS" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="LMK" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="LOC" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="FLR" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="NAM" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:element name="PC" type="xs:string"
		minOccurs="0" maxOccurs="1"/>
		<xs:any namespace="##other" processContents="lax" minOccurs="0"
		maxOccurs="unbounded"/>
		<xs:element name="country" type="ca:iso3166a2" minOccurs="0"/>
		<xs:element name="A1" type="ca:caType" minOccurs="0"/>
		<xs:element name="A2" type="ca:caType" minOccurs="0"/>
		<xs:element name="A3" type="ca:caType" minOccurs="0"/>
		<xs:element name="A4" type="ca:caType" minOccurs="0"/>
		<xs:element name="A5" type="ca:caType" minOccurs="0"/>
		<xs:element name="A6" type="ca:caType" minOccurs="0"/>
		<xs:element name="PRM" type="ca:caType" minOccurs="0"/>
		<xs:element name="PRD" type="ca:caType" minOccurs="0"/>
		<xs:element name="RD" type="ca:caType" minOccurs="0"/>
		<xs:element name="STS" type="ca:caType" minOccurs="0"/>
		<xs:element name="POD" type="ca:caType" minOccurs="0"/>
		<xs:element name="POM" type="ca:caType" minOccurs="0"/>
		<xs:element name="RDSEC" type="ca:caType" minOccurs="0"/>
		<xs:element name="RDBR" type="ca:caType" minOccurs="0"/>
		<xs:element name="RDSUBBR" type="ca:caType" minOccurs="0"/>
		<xs:element name="HNO" type="ca:caType" minOccurs="0"/>
		<xs:element name="HNS" type="ca:caType" minOccurs="0"/>
		<xs:element name="LMK" type="ca:caType" minOccurs="0"/>
		<xs:element name="LOC" type="ca:caType" minOccurs="0"/>
		<xs:element name="FLR" type="ca:caType" minOccurs="0"/>
		<xs:element name="NAM" type="ca:caType" minOccurs="0"/>
		<xs:element name="PC" type="ca:caType" minOccurs="0"/>
		<xs:element name="BLD" type="ca:caType" minOccurs="0"/>
		<xs:element name="UNIT" type="ca:caType" minOccurs="0"/>
		<xs:element name="ROOM" type="ca:caType" minOccurs="0"/>
		<xs:element name="SEAT" type="ca:caType" minOccurs="0"/>
		<xs:element name="PLC" type="xs:token" minOccurs="0"/>
		<xs:element name="PCN" type="ca:caType" minOccurs="0"/>
		<xs:element name="POBOX" type="ca:caType" minOccurs="0"/>
		<xs:element name="ADDCODE" type="ca:caType" minOccurs="0"/>
		<xs:any namespace="##other" processContents="lax"
		minOccurs="0" maxOccurs="unbounded"/>
		</xs:sequence>
		<xs:anyAttribute namespace="##any" processContents="lax"/>
		</xs:complexType>
		</xs:schema>

ttcn/LibEmcom/LibNg112/xsd/UsefulTtcn3Types.ttcn

+23 −23

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2016 Ericsson Telecom AB
		* Copyright (c) 2000-2018 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4B
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* are made available under the terms of the Eclipse Public License v2.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		*******************************************************************************/
		//
		// File: UsefulTtcn3Types.ttcn
		@@ -21,37 +21,37 @@
		module UsefulTtcn3Types {


		type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
		type integer byte (-128 .. 127) /with { variant "8 bit" }/;

		type integer unsignedbyte (0 .. 255) with { variant "/unsigned 8 bit/" };
		type integer unsignedbyte (0 .. 255) /with { variant "unsigned 8 bit" }/;

		type integer short (-32768 .. 32767) with { variant "/16 bit/" };
		type integer short (-32768 .. 32767) /with { variant "16 bit" }/;

		type integer unsignedshort (0 .. 65535) with { variant "/unsigned 16 bit/" };
		type integer unsignedshort (0 .. 65535) /with { variant "unsigned 16 bit" }/;

		type integer long (-2147483648 .. 2147483647) with { variant "/32 bit/" };
		type integer long (-2147483648 .. 2147483647) /with { variant "32 bit" }/;

		type integer unsignedlong (0 .. 4294967295) with { variant "/unsigned 32 bit/" };
		type integer unsignedlong (0 .. 4294967295) /with { variant "unsigned 32 bit" }/;

		type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) / with { variant "/64 bit*/" };
		type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /with { variant "64 bit" }/;

		type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) / with { variant "/unsigned 64 bit*/" };
		type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /with { variant "unsigned 64 bit" }/;

		type float IEEE754float with { variant "/IEEE754 float/" };
		type float IEEE754float /with { variant "IEEE754 float" }/;

		type float IEEE754double with { variant "/IEEE754 double/" };
		type float IEEE754double /with { variant "IEEE754 double" }/;

		type float IEEE754extfloat with { variant "/IEEE754 extended float/" };
		type float IEEE754extfloat /with { variant "IEEE754 extended float" }/;

		type float IEEE754extdouble with { variant "/IEEE754 extended double/" };
		type float IEEE754extdouble /with { variant "IEEE754 extended double" }/;

		type universal charstring utf8string with { variant "/UTF-8/" };
		type universal charstring utf8string /with { variant "UTF-8" }/;

		type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/UCS-2/" };
		type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /with { variant "UCS-2" }/;

		type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/UTF-16/" };
		type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /with { variant "UTF-16" }/;

		type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/8 bit/" };
		type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /with { variant "8 bit" }/;

		type record IDLfixed
		{
		@@ -59,9 +59,9 @@ module UsefulTtcn3Types {
		short scale,
		charstring value_
		}
		with {
		variant "/IDL:fixed FORMAL/01-12-01 v.2.6/";
		};
		/*with {
		variant "IDL:fixed FORMAL/01-12-01 v.2.6";
		}*/;

		/*
		type charstring char length (1);

ttcn/LibEmcom/LibNg112/xsd/XSD.ttcn

+5 −5

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2016 Ericsson Telecom AB
		* Copyright (c) 2000-2018 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4B
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* are made available under the terms of the Eclipse Public License v2.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		*******************************************************************************/
		//
		// File: XSD.ttcn
		@@ -311,7 +311,7 @@ type utf8string XMLCompatibleString
		(
		char(0,0,0,9)..char(0,0,0,9),
		char(0,0,0,10)..char(0,0,0,10),
		char(0,0,0,12)..char(0,0,0,12),
		char(0,0,0,13)..char(0,0,0,13),
		char(0,0,0,32)..char(0,0,215,255),
		char(0,0,224,0)..char(0,0,255,253),
		char(0,1,0,0)..char(0,16,255,253)

ttcn/LibEmcom/LibNg112/xsd/http_www_opengis_net_gml.ttcn

+97 −95

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2018 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4A
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4B
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* are made available under the terms of the Eclipse Public License v2.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		*******************************************************************************/
		//
		// File: http_www_opengis_net_gml.ttcn
		@@ -14,7 +14,7 @@
		// References:
		// Rev:
		// Prodnr:
		// Updated: Tue Jul 3 08:58:44 2018
		// Updated: Mon Aug 6 16:26:04 2018
		// Contact: http://ttcn.ericsson.se
		//
		////////////////////////////////////////////////////////////////////////////////
		@@ -22,19 +22,19 @@
		// - basicTypes.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		// - gmlBase.xsd
		// - geometryBasic0d1d.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		// - measures.xsd
		// - geometryBasic2d.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		// - geometryBasic0d1d.xsd
		// - geometryPrimitives.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		// - geometryBasic2d.xsd
		// - gmlBase.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		// - geometryPrimitives.xsd
		// - measures.xsd
		// /* xml version = "1.0" */
		// /* targetnamespace = "http://www.opengis.net/gml" */
		////////////////////////////////////////////////////////////////////////////////
		@@ -119,79 +119,6 @@ with {
		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . */


		type record AbstractGMLType
		{
		Id id optional
		}
		with {
		variant "abstract";
		variant (id) "attribute";
		};


		type XSD.ID Id
		with {
		variant "name as uncapitalized";
		variant "attribute";
		};
		/*

		type union Object_group
		{
		XSD.AnyType object,
		GML_group gML
		}
		with {
		variant "untagged";
		variant (object) "name as '_Object'";
		variant (object) "form as qualified";
		variant (object) "abstract";
		variant (gML) "name as '_GML'";
		};


		type union GML_group
		{
		AbstractGMLType gML,
		Geometry_group geometry
		}
		with {
		variant "untagged";
		variant (gML) "name as '_GML'";
		variant (gML) "form as qualified";
		variant (gML) "abstract";
		variant (geometry) "name as '_Geometry'";
		};

		*/
		/* Copyright (c) 2007,2009 Open Geospatial Consortium.
		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . */


		type MeasureType Measure
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		type MeasureType LengthType;


		type MeasureType Angle
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		type MeasureType AngleType;


		/* Copyright (c) 2007,2009 Open Geospatial Consortium.
		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . */
		/*

		type record GeometryPropertyType
		{
		Geometry_group geometry
		@@ -201,7 +128,6 @@ with {
		};



		type record GeometryArrayPropertyType
		{
		record of Geometry_group geometry_list
		@@ -210,7 +136,7 @@ with {
		variant (geometry_list) "untagged";
		variant (geometry_list[-]) "name as '_Geometry'";
		};
		*/


		type record AbstractGeometryType
		{
		@@ -396,7 +322,6 @@ with {
		variant (choice.pos_list[-]) "name as 'pos'";
		};

		/*

		type union Geometry_group
		{
		@@ -433,7 +358,7 @@ with {
		variant (surface) "name as '_Surface'";
		};

		*/

		type union Curve_group
		{
		AbstractCurveType curve,
		@@ -456,7 +381,7 @@ with {

		type AbstractGeometricPrimitiveType AbstractSurfaceType;

		/*

		type SurfacePropertyType SurfaceProperty
		with {
		variant "name as uncapitalized";
		@@ -472,8 +397,6 @@ with {
		variant (surface) "name as '_Surface'";
		};

		*/


		type PolygonType Polygon
		with {
		@@ -557,7 +480,7 @@ with {
		variant (choice.choice_list[-]) "untagged";
		};

		/*

		type union Surface_group_1
		{
		AbstractSurfaceType surface,
		@@ -573,13 +496,16 @@ with {
		variant (surface) "form as qualified";
		variant (surface) "abstract";
		variant (arcBand) "name as capitalized";
		variant (arcBand) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		variant (circle) "name as capitalized";
		variant (circle) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		variant (ellipse) "name as capitalized";
		variant (ellipse) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		variant (polygon) "name as capitalized";
		variant (surface_1) "name as 'Surface'";
		};

		*/

		type union Ring_group
		{
		AbstractRingType ring,
		@@ -860,7 +786,7 @@ type SurfacePatchArrayPropertyType PolygonPatchArrayPropertyType;

		type AbstractGeometricPrimitiveType AbstractSolidType;

		/*

		type SolidType Solid
		with {
		variant "element";
		@@ -886,7 +812,7 @@ with {
		variant (uomLabels) "attribute";
		};

		*/

		type enumerated CurveInterpolationType
		{
		circularArc3Points,
		@@ -970,7 +896,7 @@ with {
		variant (patches) "form as qualified";
		};

		/*

		type union Solid_group
		{
		AbstractSolidType solid,
		@@ -985,11 +911,87 @@ with {
		variant (solid) "form as qualified";
		variant (solid) "abstract";
		variant (ellipsoid) "name as capitalized";
		variant (ellipsoid) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		variant (prism) "name as capitalized";
		variant (prism) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		variant (solid_1) "name as 'Solid'";
		variant (sphere) "name as capitalized";
		variant (sphere) "namespace as 'http://www.opengis.net/pidflo/1.0' prefix 'gs'";
		};


		/* Copyright (c) 2007,2009 Open Geospatial Consortium.
		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . */


		type record AbstractGMLType
		{
		Id id optional
		}
		with {
		variant "abstract";
		variant (id) "attribute";
		};


		type XSD.ID Id
		with {
		variant "name as uncapitalized";
		variant "attribute";
		};


		type union Object_group
		{
		XSD.AnyType object,
		GML_group gML
		}
		with {
		variant "untagged";
		variant (object) "name as '_Object'";
		variant (object) "form as qualified";
		variant (object) "abstract";
		variant (gML) "name as '_GML'";
		};
		*/


		type union GML_group
		{
		AbstractGMLType gML,
		Geometry_group geometry
		}
		with {
		variant "untagged";
		variant (gML) "name as '_GML'";
		variant (gML) "form as qualified";
		variant (gML) "abstract";
		variant (geometry) "name as '_Geometry'";
		};


		/* Copyright (c) 2007,2009 Open Geospatial Consortium.
		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ . */


		type MeasureType Measure
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		type MeasureType LengthType;


		type MeasureType Angle
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		type MeasureType AngleType;


		}
		with {

ttcn/LibEmcom/LibNg112/xsd/http_www_opengis_net_pidflo_1_0.ttcn

+4 −172

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2018 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4A
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4B
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* are made available under the terms of the Eclipse Public License v2.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		*******************************************************************************/
		//
		// File: http_www_opengis_net_pidflo_1_0.ttcn
		@@ -14,7 +14,7 @@
		// References:
		// Rev:
		// Prodnr:
		// Updated: Tue Jul 3 08:58:44 2018
		// Updated: Mon Aug 6 16:26:04 2018
		// Contact: http://ttcn.ericsson.se
		//
		////////////////////////////////////////////////////////////////////////////////
		@@ -230,174 +230,6 @@ with {
		};





		type union Object_group
		{
		XSD.AnyType object,
		GML_group gML
		}
		with {
		variant "untagged";
		variant (object) "name as '_Object'";
		variant (object) "form as qualified";
		variant (object) "abstract";
		variant (gML) "name as '_GML'";
		};


		type union GML_group
		{
		AbstractGMLType gML,
		Geometry_group geometry
		}
		with {
		variant "untagged";
		variant (gML) "name as '_GML'";
		variant (gML) "form as qualified";
		variant (gML) "abstract";
		variant (geometry) "name as '_Geometry'";
		};


		type record GeometryPropertyType
		{
		Geometry_group geometry
		}
		with {
		variant (geometry) "name as '_Geometry'";
		};


		type record GeometryArrayPropertyType
		{
		record of Geometry_group geometry_list
		}
		with {
		variant (geometry_list) "untagged";
		variant (geometry_list[-]) "name as '_Geometry'";
		};

		type union Geometry_group
		{
		AbstractGeometryType geometry,
		GeometricPrimitive_group geometricPrimitive,
		Ring_group ring
		}
		with {
		variant "untagged";
		variant (geometry) "name as '_Geometry'";
		variant (geometry) "form as qualified";
		variant (geometry) "abstract";
		variant (geometricPrimitive) "name as '_GeometricPrimitive'";
		variant (ring) "name as '_Ring'";
		};


		type union GeometricPrimitive_group
		{
		AbstractGeometricPrimitiveType geometricPrimitive,
		Curve_group curve,
		Point point,
		Solid_group solid,
		Surface_group_1 surface
		}
		with {
		variant "untagged";
		variant (geometricPrimitive) "name as '_GeometricPrimitive'";
		variant (geometricPrimitive) "form as qualified";
		variant (geometricPrimitive) "abstract";
		variant (curve) "name as '_Curve'";
		variant (point) "name as capitalized";
		variant (solid) "name as '_Solid'";
		variant (surface) "name as '_Surface'";
		};

		type SolidType Solid
		with {
		variant "element";
		};


		type record SolidType
		{
		NCNameList axisLabels optional,
		XSD.String gid optional,
		Id id optional,
		XSD.PositiveInteger srsDimension optional,
		XSD.AnyURI srsName optional,
		NCNameList uomLabels optional,
		SurfacePropertyType exterior optional
		}
		with {
		variant (axisLabels) "attribute";
		variant (gid) "attribute";
		variant (id) "attribute";
		variant (srsDimension) "attribute";
		variant (srsName) "attribute";
		variant (uomLabels) "attribute";
		};


		type union Solid_group
		{
		AbstractSolidType solid,
		Ellipsoid ellipsoid,
		Prism prism,
		Solid solid_1,
		Sphere sphere
		}
		with {
		variant "untagged";
		variant (solid) "name as '_Solid'";
		variant (solid) "form as qualified";
		variant (solid) "abstract";
		variant (ellipsoid) "name as capitalized";
		variant (prism) "name as capitalized";
		variant (solid_1) "name as 'Solid'";
		variant (sphere) "name as capitalized";
		};


		type SurfacePropertyType SurfaceProperty
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		type record SurfacePropertyType
		{
		Surface_group_1 surface
		}
		with {
		variant (surface) "name as '_Surface'";
		};


		type union Surface_group_1
		{
		AbstractSurfaceType surface,
		ArcBand arcBand,
		Circle circle,
		Ellipse ellipse,
		Polygon polygon,
		Surface_group surface_1
		}
		with {
		variant "untagged";
		variant (surface) "name as '_Surface'";
		variant (surface) "form as qualified";
		variant (surface) "abstract";
		variant (arcBand) "name as capitalized";
		variant (circle) "name as capitalized";
		variant (ellipse) "name as capitalized";
		variant (polygon) "name as capitalized";
		variant (surface_1) "name as 'Surface'";
		};


		}
		with {
		encode "XML";

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2016 Ericsson Telecom AB
		* Copyright (c) 2000-2018 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
		* XSD to TTCN-3 Translator version: CRL 113 200/6 R4B
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* are made available under the terms of the Eclipse Public License v2.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		*******************************************************************************/
		//
		// File: UsefulTtcn3Types.ttcn
		@@ -21,37 +21,37 @@
		module UsefulTtcn3Types {


		type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
		type integer byte (-128 .. 127) /with { variant "8 bit" }/;

		type integer unsignedbyte (0 .. 255) with { variant "/unsigned 8 bit/" };
		type integer unsignedbyte (0 .. 255) /with { variant "unsigned 8 bit" }/;

		type integer short (-32768 .. 32767) with { variant "/16 bit/" };
		type integer short (-32768 .. 32767) /with { variant "16 bit" }/;

		type integer unsignedshort (0 .. 65535) with { variant "/unsigned 16 bit/" };
		type integer unsignedshort (0 .. 65535) /with { variant "unsigned 16 bit" }/;

		type integer long (-2147483648 .. 2147483647) with { variant "/32 bit/" };
		type integer long (-2147483648 .. 2147483647) /with { variant "32 bit" }/;

		type integer unsignedlong (0 .. 4294967295) with { variant "/unsigned 32 bit/" };
		type integer unsignedlong (0 .. 4294967295) /with { variant "unsigned 32 bit" }/;

		type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) / with { variant "/64 bit*/" };
		type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /with { variant "64 bit" }/;

		type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) / with { variant "/unsigned 64 bit*/" };
		type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /with { variant "unsigned 64 bit" }/;

		type float IEEE754float with { variant "/IEEE754 float/" };
		type float IEEE754float /with { variant "IEEE754 float" }/;

		type float IEEE754double with { variant "/IEEE754 double/" };
		type float IEEE754double /with { variant "IEEE754 double" }/;

		type float IEEE754extfloat with { variant "/IEEE754 extended float/" };
		type float IEEE754extfloat /with { variant "IEEE754 extended float" }/;

		type float IEEE754extdouble with { variant "/IEEE754 extended double/" };
		type float IEEE754extdouble /with { variant "IEEE754 extended double" }/;

		type universal charstring utf8string with { variant "/UTF-8/" };
		type universal charstring utf8string /with { variant "UTF-8" }/;

		type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/UCS-2/" };
		type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /with { variant "UCS-2" }/;

		type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/UTF-16/" };
		type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /with { variant "UTF-16" }/;

		type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/8 bit/" };
		type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /with { variant "8 bit" }/;

		type record IDLfixed
		{
		@@ -59,9 +59,9 @@ module UsefulTtcn3Types {
		short scale,
		charstring value_
		}
		with {
		variant "/IDL:fixed FORMAL/01-12-01 v.2.6/";
		};
		/*with {
		variant "IDL:fixed FORMAL/01-12-01 v.2.6";
		}*/;

		/*
		type charstring char length (1);