Skip to content

Commit

Permalink
Merge pull request hotosm#291 from hotosm/update/licenses
Browse files Browse the repository at this point in the history
Update/licenses
  • Loading branch information
smit1678 authored Dec 14, 2018
2 parents 190921a + 83b54b4 commit 2736692
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 9 deletions.
22 changes: 15 additions & 7 deletions src/components/uploader/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ function createProgressTracker(progressStats, fileName, component) {
);

const percentComplete =
(progress.sumTotalUploaded / progress.sumFilesize) * 100;
progress.sumTotalUploaded / progress.sumFilesize * 100;
const percentDisplay = Math.round(percentComplete);
const plural = progressStatsValues.length > 1 ? "s" : "";
const uploadStatus = `Uploading ${
progressStatsValues.length
} image${plural} (${percentDisplay}%).`;
const uploadStatus = `Uploading ${progressStatsValues.length} image${plural} (${percentDisplay}%).`;
component.setState({
uploadProgress: percentComplete,
uploadActive: true,
Expand Down Expand Up @@ -475,12 +473,22 @@ export default createReactClass({
<a href="https://github.com/openimagerynetwork/oin-register#open-imagery-network">
Open Imagery Network (OIN)
</a>
. All imagery contained in OIN is licensed{" "}
</p>
<p>
Except when permitted by the OpenStreetMap exception (see
below), all imagery contained in OIN is licensed{" "}
<a href="https://creativecommons.org/licenses/by/4.0/">
CC-BY 4.0
</a>
, with attribution as contributors of Open Imagery Network.
All imagery is available to be traced in OpenStreetMap.
, with attribution as "© OIN contributors", and specific
additional SA/NC conditions if selected upon upload.
</p>
<p>
IMPORTANT NOTICE - OPENSTREETMAP EXCEPTION: You agree that
users do not have to comply with the selected license when the
imagery is used for tracing in OpenStreetMap. In these cases,
you agree that the derived data from the imagery is made
available under the ODBL license.
</p>
</div>

Expand Down
28 changes: 28 additions & 0 deletions src/components/uploader/scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,34 @@ Please check the instructions on how to use files from Google Drive.
</a>
</label>
</div>
<div className="radio">
<label>
<input
type="radio"
name={this.getRadioName("license")}
onChange={this.onChange}
value="CC BY-NC 4.0"
checked={this.props.data["license"] === "CC BY-NC 4.0"}
/>
<a href="https://creativecommons.org/licenses/by-nc/4.0/">
CC BY-NC 4.0
</a>
</label>
</div>
<div className="radio">
<label>
<input
type="radio"
name={this.getRadioName("license")}
onChange={this.onChange}
value="CC BY-SA 4.0"
checked={this.props.data["license"] === "CC BY-SA 4.0"}
/>
<a href="https://creativecommons.org/licenses/by-sa/4.0/">
CC BY-SA 4.0
</a>
</label>
</div>
</div>
</div>
</fieldset>
Expand Down
4 changes: 3 additions & 1 deletion src/components/user_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ export default createReactClass({
<li>
{this.requestedUser === "current" ? (
<span>
<a href={"/#/imagery/" + image._id + "/edit"}>Edit</a>{" "}
<a href={"/#/imagery/" + image._id + "/edit"}>
Edit
</a>{" "}
|&nbsp;
</span>
) : null}
Expand Down
3 changes: 2 additions & 1 deletion src/utils/ds_zoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ export default L.Control.extend({
var link = L.DomUtil.create("button", className, container);
link.innerHTML = html;

L.DomEvent.on(link, "mousedown dblclick", L.DomEvent.stopPropagation)
L.DomEvent
.on(link, "mousedown dblclick", L.DomEvent.stopPropagation)
.on(link, "click", L.DomEvent.stop)
.on(link, "click", fn, this)
.on(link, "click", this._refocusOnMap, this);
Expand Down

0 comments on commit 2736692

Please sign in to comment.