Skip to content

List entities v2 #240

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
Merged
ykulbak merged 3 commits into from
Nov 27, 2020
Merged

List entities v2 #240

ykulbak merged 3 commits into from
Nov 27, 2020

Conversation

@jasollien
Copy link
Contributor

@jasollien jasollien commented Nov 25, 2020 •
edited by pasi-paasiala
Loading

Make list entities consistent.

  1. List elements should have a wrapper

example:

before:

<Topic>
  <RelatedTopic>...</RelatedTopic>
  <RelatedTopic>...</RelatedTopic>
</Topic>

now:

<Topic>
  <RelatedTopics>
    <RelatedTopic>...</RelatedTopic>
    <RelatedTopic>...</RelatedTopic>
  </RelatedTopics>
</Topic>
  1. Singular elements should use singular name
    example:

before:

<Topic>
  <DocumentReferences>...</DocumentReferences>
  <DocumentReferences>...</DocumentReferences>
</Topic>

now:

<Topic>
  <DocumentReferences>
    <DocumentReference>...</DocumentReference>
    <DocumentReference>...</DocumentReference>
  </DocumentReferences>
</Topic>

@jasollien jasollien changed the base branch from release_2_1 to release_2_2 November 25, 2020 07:52
@jasollien jasollien mentioned this pull request Nov 25, 2020
Closed
pbuts
pbuts reviewed Nov 25, 2020
View reviewed changes
@jasollien
Copy link
Contributor Author

jasollien commented Nov 25, 2020 •
edited
Loading

Produced xml.

Viewpoint.xml:

<?xml version="1.0" encoding="utf-8"?>
<VisualizationInfo Guid="str1234">
  <Components>
    <Component IfcGuid="str1110000000000000000">
      <OriginatingSystem>str1234</OriginatingSystem>
      <AuthoringToolId>str1234</AuthoringToolId>
    </Component>
  </Components>
  <OrthogonalCamera>
    <CameraViewPoint>
      <X>3.1415926535</X>
      <Y>3.1415926535</Y>
      <Z>3.1415926535</Z>
    </CameraViewPoint>
    <CameraDirection>
      <X>3.1415926535</X>
      <Y>3.1415926535</Y>
      <Z>3.1415926535</Z>
    </CameraDirection>
    <CameraUpVector>
      <X>3.1415926535</X>
      <Y>3.1415926535</Y>
      <Z>3.1415926535</Z>
    </CameraUpVector>
    <ViewToWorldScale>3.1415926535</ViewToWorldScale>
    <AspectRatio>3.1415926535</AspectRatio>
  </OrthogonalCamera>
  <Lines>
    <Line>
      <StartPoint>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </StartPoint>
      <EndPoint>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </EndPoint>
    </Line>
  </Lines>
  <ClippingPlanes>
    <ClippingPlane>
      <Location>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </Location>
      <Direction>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </Direction>
    </ClippingPlane>
  </ClippingPlanes>
  <Bitmaps>
    <Bitmap>
      <Format>PNG</Format>
      <Reference>str1234</Reference>
      <Location>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </Location>
      <Normal>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </Normal>
      <Up>
        <X>3.1415926535</X>
        <Y>3.1415926535</Y>
        <Z>3.1415926535</Z>
      </Up>
      <Height>3.1415926535</Height>
    </Bitmap>
  </Bitmaps>
</VisualizationInfo>

pbuts
pbuts reviewed Nov 25, 2020
View reviewed changes
Schemas/markup.xsd
<xs:element name="Header" type="Header" minOccurs="0"/>
<xs:element name="Topic" type="Topic"/>
<xs:element name="Comment" type="Comment" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="Comments" minOccurs="0">
Copy link
Contributor

@pbuts pbuts Nov 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments and Viewpoints elements were discussed to be moved into the Topic element

Copy link
Contributor Author

@jasollien jasollien Nov 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. Can fix

Copy link
Contributor Author

@jasollien jasollien Nov 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the same be done with viewpoints also then?

Copy link
Contributor Author

@jasollien jasollien Nov 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any other inputs?

Copy link
Contributor Author

@jasollien jasollien Nov 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pbuts, I'll move the comments (and viewpoints) in another PR.

@jasollien
Copy link
Contributor Author

jasollien commented Nov 25, 2020

markup.xml:

<?xml version="1.0" encoding="utf-8"?>
<Markup>
  <Header>
    <File IfcProject="str1234000000000000000" IfcSpatialStructureElement="str1234000000000000000" IsExternal="true">
      <Filename>str1234</Filename>
      <Date>2012-12-13T12:12:12</Date>
      <Reference>str1234</Reference>
    </File>
  </Header>
  <Topic Guid="str1234" ServerAssignedId="str1234" TopicType="str1234" TopicStatus="str1234">
    <ReferenceLinks>
      <ReferenceLink>str1234</ReferenceLink>
    </ReferenceLinks>
    <Title>str1234</Title>
    <Priority>str1234</Priority>
    <Index>123</Index>
    <Labels>
      <Label>str1234</Label>
    </Labels>
    <CreationDate>2012-12-13T12:12:12</CreationDate>
    <CreationAuthor>str1234</CreationAuthor>
    <ModifiedDate>2012-12-13T12:12:12</ModifiedDate>
    <ModifiedAuthor>str1234</ModifiedAuthor>
    <DueDate>2012-12-13T12:12:12</DueDate>
    <AssignedTo>str1234</AssignedTo>
    <Stage>str1234</Stage>
    <Description>str1234</Description>
    <BimSnippet SnippetType="str1234" IsExternal="true">
      <Reference>str1234</Reference>
      <ReferenceSchema>str1234</ReferenceSchema>
    </BimSnippet>
    <DocumentReferences>
      <DocumentReference Guid="str1234">
        <DocumentGuid>str1234</DocumentGuid>
        <Description>str1234</Description>
      </DocumentReference>
    </DocumentReferences>
    <RelatedTopics>
      <RelatedTopic Guid="str1234" />
    </RelatedTopics>
  </Topic>
  <Comments>
    <Comment Guid="str1234">
      <Date>2012-12-13T12:12:12</Date>
      <Author>str1234</Author>
      <Comment>str1234</Comment>
      <Viewpoint Guid="str1234" />
      <ModifiedDate>2012-12-13T12:12:12</ModifiedDate>
      <ModifiedAuthor>str1234</ModifiedAuthor>
    </Comment>
  </Comments>
  <Viewpoints>
    <ViewPoint Guid="str1234">
      <Viewpoint>str1234</Viewpoint>
      <Snapshot>str1234</Snapshot>
      <Index>123</Index>
    </ViewPoint>
  </Viewpoints>
</Markup>

@ykulbak ykulbak changed the base branch from release_2_2 to release_3_0 November 25, 2020 08:49
@pasi-paasiala
Copy link
Contributor

pasi-paasiala commented Nov 26, 2020

The PR description could explain what is done and why

pasi-paasiala
pasi-paasiala approved these changes Nov 26, 2020
View reviewed changes
Copy link
Contributor

@pasi-paasiala pasi-paasiala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@ykulbak ykulbak linked an issue Nov 27, 2020 that may be closed by this pull request
Fix list entities #239
Closed
@ykulbak ykulbak merged commit f935cd4 into release_3_0 Nov 27, 2020
@GeorgDangl GeorgDangl deleted the list-entities-v2 branch February 1, 2021 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ykulbak ykulbak ykulbak approved these changes

@pasi-paasiala pasi-paasiala pasi-paasiala approved these changes

+1 more reviewer

@pbuts pbuts pbuts left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Fix list entities

5 participants

@jasollien @pasi-paasiala @ykulbak @pbuts