diff --git a/src/converters/figuredata/FigureDataConverter.ts b/src/converters/figuredata/FigureDataConverter.ts index a2fcc19..04f7335 100644 --- a/src/converters/figuredata/FigureDataConverter.ts +++ b/src/converters/figuredata/FigureDataConverter.ts @@ -97,6 +97,7 @@ export class FigureDataConverter extends Converter const output: IFigureData = {}; FigureDataMapper.mapXML(xml, output); + return output; } } diff --git a/src/mapping/json/figuredata/IFigureDataColor.ts b/src/mapping/json/figuredata/IFigureDataColor.ts index 325dabc..76a65fd 100644 --- a/src/mapping/json/figuredata/IFigureDataColor.ts +++ b/src/mapping/json/figuredata/IFigureDataColor.ts @@ -2,7 +2,7 @@ export interface IFigureDataColor { id?: number; index?: number; - club?: boolean; + club?: number; selectable?: boolean; hexCode?: string; } diff --git a/src/mapping/xml/figuredata/FigureDataColorXML.ts b/src/mapping/xml/figuredata/FigureDataColorXML.ts index 6161d19..292d34f 100644 --- a/src/mapping/xml/figuredata/FigureDataColorXML.ts +++ b/src/mapping/xml/figuredata/FigureDataColorXML.ts @@ -2,7 +2,7 @@ export class FigureDataColorXML { private _id: number; private _index: number; - private _club: boolean; + private _club: number; private _selectable: boolean; private _hexCode: string; @@ -12,7 +12,7 @@ export class FigureDataColorXML this._id = ((attributes && parseInt(attributes.id)) || 0); this._index = ((attributes && parseInt(attributes.index)) || 0); - this._club = ((attributes && parseInt(attributes.club) === 1) || false); + this._club = ((attributes && parseInt(attributes.club)) || 0); this._selectable = ((attributes && parseInt(attributes.selectable) === 1) || false); this._hexCode = ((xml && xml._) || ''); @@ -28,7 +28,7 @@ export class FigureDataColorXML return this._index; } - public get club(): boolean + public get club(): number { return this._club; }