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

Visualize the polygons #68

Closed
wants to merge 21 commits into from
Closed

Conversation

im-prakher
Copy link
Contributor

@im-prakher im-prakher commented Aug 25, 2020

I have visualized the polygons as they should have been. Also modified the tests for that.
But in this PR I don't know why GitHub is failing to recognize the previous merged commits. As mentioned in this issue, https://stackoverflow.com/questions/16306012/github-pull-request-showing-commits-that-are-already-in-target-branch
I have already tried different methods to solve this but that didn't work for this.
Kindly, review this @Chris-Schnaufer @dlebauer @KristinaRiemer

@KristinaRiemer
Copy link
Contributor

I'm not sure why the previously merged commits are included here. The hashes are different for the same commits for some reason, see an example below:

PR:
Screen Shot 2020-08-26 at 10 47 22 AM

Merged:
Screen Shot 2020-08-26 at 10 46 44 AM

@KristinaRiemer
Copy link
Contributor

@im-prakher is this branch called tests a different branch than the previous ones called tests that had the tests in it (#60)?

@im-prakher
Copy link
Contributor Author

No! It is the same branch

@KristinaRiemer
Copy link
Contributor

After selecting all the relevant input_files files on the upload pages, I got this error on the cultivars map page:
Screen Shot 2020-08-28 at 7 46 11 AM

@dlebauer dlebauer changed the base branch from master to develop August 28, 2020 15:16
@dlebauer dlebauer changed the base branch from develop to master August 28, 2020 15:20
@@ -16,8 +16,8 @@ class homepage extends Component{
<div className="steps">
<div><span>Steps</span></div>
<ol>
<li>Fill out Metadata in this google spreadsheet template (How to do this).</li>
<li>Prepare a shapefile or table with plot polygons (How to do this).</li>
<li>Fill out Metadata in the google spreadsheet template (<a href="https://docs.google.com/spreadsheets/d/1c_5j7q3TO6gQ24KSopE-_LXA5HhfsUEqMupckGZAbo8/edit#gid=0" rel="noopener noreferrer" target="_blank" style= { { color: "blue"} }>How to do this</a>).</li>
Copy link
Contributor

@Chris-Schnaufer Chris-Schnaufer Aug 28, 2020

Choose a reason for hiding this comment

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

Maybe keep the color to what the user prefers - could impact Blue color blind people. Another possibility is to use the aria role link with css: https://www.w3.org/TR/wai-aria-1.1/#link

Copy link
Member

Choose a reason for hiding this comment

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

isn't this just for a hyperlink? From quick research, it looks like blue hyperlinks can be distinguished from black text. e.g. this site says "The blue links on this site are easily distinguishable from plain text to all three forms of color blindness."

For the plot colors, you can find color-blind friendly palettes from here: https://colorbrewer2.org/#type=diverging&scheme=PuOr&n=5

data.push(115);
return data
})
const res= (await client.query('SELECT ST_Geomfromtext(ST_AsText(ST_GeomFromGeoJSON($1)),4326) As wkt', [geometry]));
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice use of parameters for SQL statements!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you!

@im-prakher
Copy link
Contributor Author

The changes in this PR are reflected in #69 so I am closing this one.

@im-prakher im-prakher closed this Aug 29, 2020
@im-prakher im-prakher deleted the tests branch February 1, 2021 10:32
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.

4 participants