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.

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

Add Validation Comments #3572

Merged
merged 10 commits into from
Jun 29, 2024
Merged

Add Validation Comments #3572

merged 10 commits into from
Jun 29, 2024

Conversation

cyrusnaficy
Copy link
Collaborator

Resolves #3016

Added validation comments to the label map. If there are multiple comments, they will be seperated by a horizontal line. If there are no comments, it will display "None".

How response looks for labelID (ex.)

{
    "label_id": 49965,
    "gsv_panorama_id": "mQdJ0civrV0Em2LfNOdN5Q",
    "tutorial": false,
    "image_capture_date": "2018-09",
    "heading": 155.90847778320312,
    "pitch": -6.375,
    "zoom": 1,
    "canvas_x": 238,
    "canvas_y": 379,
    "street_edge_id": 17750,
    "region_id": 30,
    "timestamp": 1556944464421,
    "label_type_key": "SurfaceProblem",
    "label_type_value": "Surface Problem",
    "severity": 4,
    "temporary": false,
    "description": null,
    "user_validation": null,
    "num_agree": 1,
    "num_disagree": 2,
    "num_notsure": 1,
    "comments": [
        "doesn't look like a severity 4 crack",
        "Crack doesn't look severe enough to be an issue"
    ],
    "tags": []
}
Before/After screenshots (if applicable)

Before

image

After

Screenshot 2024-06-20 at 10 21 47 AM
Testing instructions
  1. Go to the label map.
  2. Open a label and enter a comment
  3. Re-open it and validator commentz will appear.
Things to check before submitting the PR
  • I've written a descriptive PR title.
  • I've added/updated comments for large or confusing blocks of code.
  • I've included before/after screenshots above.
  • I've asked for and included translations for any user facing text that was added or modified.

@cyrusnaficy cyrusnaficy marked this pull request as draft June 20, 2024 17:25
@cyrusnaficy cyrusnaficy marked this pull request as ready for review June 20, 2024 17:48
@cyrusnaficy cyrusnaficy self-assigned this Jun 20, 2024
@misaugstad misaugstad self-assigned this Jun 21, 2024
Copy link
Member

@misaugstad misaugstad left a comment

Choose a reason for hiding this comment

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

Okay this looks really good!! Don't be discouraged by the 10+ comments I added 😂 A lot of them are nit-picky about style or are slightly simpler ways to write things. Ultimately the code works, I just want us to get the code to a really good state!

I made some changes on the develop branch, and it looks like there are merge conflicts... Could you pull in the most recent changes from develop into your branch (if on your branch, running git pull origin develop and then fixing any issues with it and testing again)?

public/locales/de/common.json Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
app/models/label/LabelTable.scala Outdated Show resolved Hide resolved
public/javascripts/Admin/src/Admin.GSVLabelView.js Outdated Show resolved Hide resolved
public/javascripts/Admin/src/Admin.GSVLabelView.js Outdated Show resolved Hide resolved
@cyrusnaficy
Copy link
Collaborator Author

Okay this looks really good!! Don't be discouraged by the 10+ comments I added 😂 A lot of them are nit-picky about style or are slightly simpler ways to write things. Ultimately the code works, I just want us to get the code to a really good state!

I made some changes on the develop branch, and it looks like there are merge conflicts... Could you pull in the most recent changes from develop into your branch (if on your branch, running git pull origin develop and then fixing any issues with it and testing again)?

Sorry for the styling issues, will make sure I review the guide before requesting review for new PRs. I commited changes for all the above. Thanks for the comments!

@misaugstad
Copy link
Member

I didn't check everything just now, but I left one comment, and I also noticed that you haven't pulled in changes from develop and resolved merge conflicts yet. From what else I saw though, it's looking real good!

@cyrusnaficy
Copy link
Collaborator Author

I didn't check everything just now, but I left one comment, and I also noticed that you haven't pulled in changes from develop and resolved merge conflicts yet. From what else I saw though, it's looking real good!

Thanks, just resolved merge conflicts.

@misaugstad
Copy link
Member

@cyrusnaficy you'll need to check to make sure that everything is working correctly after resolving merge conflicts! Just because you resolved everything that git noticed, doesn't mean that everything works properly! And taking a look at your merge, it looks like you left in the "<<<<<<< HEAD" lines and such, which are giving compilation errors!

Copy link
Member

@misaugstad misaugstad left a comment

Choose a reason for hiding this comment

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

Looks good, thank you @cyrusnaficy !!

@misaugstad misaugstad merged commit c8b6651 into develop Jun 29, 2024
@misaugstad misaugstad deleted the 3016-validation-comments branch June 29, 2024 00:57
@misaugstad misaugstad mentioned this pull request Jun 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add validation comments to LabelMap
2 participants