Skip to content
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

feat(demo): new page for OSDP integration #2677

Merged
merged 1 commit into from
Jan 10, 2025
Merged

feat(demo): new page for OSDP integration #2677

merged 1 commit into from
Jan 10, 2025

Conversation

DamonU2
Copy link
Member

@DamonU2 DamonU2 commented Jan 8, 2025 •
edited by jolevesq
Loading

Closes #2675
Closes #2676

Also fixes rendering issue with multiple style types

Description

Adds a page to mimic OSDP geoview implementation in order to replicate their issues.
Also fixes a bug where icons from a layer with multiple style types would fail to render.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

https://damonu2.github.io/geoview/demos-navigator.html?config=./configs/navigator/16-esri-dynamic.json - for rendering bug, issue was with 2020 combined sewer icons in data table and details

https://damonu2.github.io/geoview/demo-osdp-integration.html

Checklist:

  • I have build (rush build) and deploy (rush host) my PR
  • I have connected the issues(s) to this PR
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • I have created new issue(s) related to the outcome of this PR is needed
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

This change is Reviewable

@DamonU2 DamonU2 requested a review from jolevesq January 8, 2025 19:53
@DamonU2 DamonU2 self-assigned this Jan 8, 2025
@jolevesq jolevesq requested a review from Alex-NRCan January 8, 2025 19:57
@DamonU2 DamonU2 force-pushed the OSDP-demo-page branch 4 times, most recently from f6bf918 to d194c46 Compare January 9, 2025 20:05
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 9, 2025
View reviewed changes
packages/geoview-core/src/app.tsx Fixed Show resolved Hide resolved
jolevesq
jolevesq requested changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewed 7 of 7 files at r1, 1 of 1 files at r4, all commit messages.
Reviewable status: 7 of 8 files reviewed, 4 unresolved discussions (waiting on @Alex-NRCan and @DamonU2)

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 142 at r1 (raw file):

        });
      }

Trailing spaces

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 168 at r1 (raw file):

            .then(() => {
              cgpv.api.createMapFromConfig('Map1', JSON.stringify(mapConfig), 800)
              .then(() => {

Trailing spaces

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 193 at r1 (raw file):

        if (document.getElementById('Map1')) addLayers(uuidList);
      });

trailing spaces

DamonU2
DamonU2 commented Jan 10, 2025
View reviewed changes
Copy link
Member Author

@DamonU2 DamonU2 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 6 of 8 files reviewed, 4 unresolved discussions (waiting on @Alex-NRCan, @Github-advanced-security[bot], and @jolevesq)

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 142 at r1 (raw file):

Previously, jolevesq (Johann Levesque) wrote…

Trailing spaces

Done.

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 168 at r1 (raw file):

Previously, jolevesq (Johann Levesque) wrote…

Trailing spaces

Not seeing any here? Already fixed?

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 193 at r1 (raw file):

Previously, jolevesq (Johann Levesque) wrote…

trailing spaces

Not seeing any here? Already fixed?

packages/geoview-core/src/app.tsx Fixed Show resolved Hide resolved
jolevesq
jolevesq requested changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewed all commit messages.
Reviewable status: 6 of 8 files reviewed, 3 unresolved discussions (waiting on @Alex-NRCan, @DamonU2, and @Github-advanced-security[bot])

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 227 at r5 (raw file):

      /** OSDP function
       * Removes a map if it exists.
       *

White space

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 257 at r5 (raw file):

      /** OSDP function
       * Refresh the map.
       *

White space

jolevesq
jolevesq reviewed Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewable status: 6 of 8 files reviewed, 3 unresolved discussions (waiting on @Alex-NRCan, @DamonU2, and @Github-advanced-security[bot])

packages/geoview-core/src/app.tsx Fixed Show resolved Hide resolved
DamonU2
DamonU2 commented Jan 10, 2025
View reviewed changes
Copy link
Member Author

@DamonU2 DamonU2 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 6 of 8 files reviewed, 3 unresolved discussions (waiting on @Alex-NRCan, @Github-advanced-security[bot], and @jolevesq)

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 227 at r5 (raw file):

Previously, jolevesq (Johann Levesque) wrote…

White space

Done.

packages/geoview-core/public/templates/demos/demo-osdp-integration.html line 257 at r5 (raw file):

Previously, jolevesq (Johann Levesque) wrote…

White space

Done.

packages/geoview-core/src/app.tsx Fixed Show resolved Hide resolved
jolevesq
jolevesq reviewed Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r5, 1 of 1 files at r6, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @Alex-NRCan and @Github-advanced-security[bot])

jolevesq
jolevesq approved these changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Alex-NRCan and @Github-advanced-security[bot])

jolevesq
jolevesq approved these changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Alex-NRCan and @Github-advanced-security[bot])

jolevesq
jolevesq requested changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Alex-NRCan and @jolevesq)

jolevesq
jolevesq approved these changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Alex-NRCan and @Github-advanced-security[bot])

packages/geoview-core/src/app.tsx Fixed Show resolved Hide resolved
jolevesq
jolevesq approved these changes Jan 10, 2025
View reviewed changes
Copy link
Member

@jolevesq jolevesq left a comment

Choose a reason for hiding this comment

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

Dismissed @Github-advanced-security[bot] from a discussion.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Alex-NRCan)

@jolevesq jolevesq merged commit 1534222 into Canadian-Geospatial-Platform:develop Jan 10, 2025
6 checks passed
@DamonU2 DamonU2 deleted the OSDP-demo-page branch January 10, 2025 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jolevesq jolevesq jolevesq approved these changes

@Alex-NRCan Alex-NRCan Awaiting requested review from Alex-NRCan

Assignees

@DamonU2 DamonU2

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@DamonU2 @jolevesq