From 3f084a9ac71e60fea64ead18a4566b26f9cb3100 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Thu, 29 Nov 2018 19:26:35 +0000 Subject: [PATCH 1/4] add cc-by-nc and cc-by-sa licenses --- src/components/uploader/scene.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/components/uploader/scene.js b/src/components/uploader/scene.js index b9f85b78..c57a0c7a 100644 --- a/src/components/uploader/scene.js +++ b/src/components/uploader/scene.js @@ -626,6 +626,34 @@ Please check the instructions on how to use files from Google Drive. +
+ +
+
+ +
From 5718ab89f28e10fd3e1b4716a262f4033687b9a8 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Thu, 29 Nov 2018 19:52:31 +0000 Subject: [PATCH 2/4] update language for multiple licenses --- src/components/uploader/home.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/uploader/home.js b/src/components/uploader/home.js index b5f2be98..913aa83e 100644 --- a/src/components/uploader/home.js +++ b/src/components/uploader/home.js @@ -479,8 +479,9 @@ export default createReactClass({ CC-BY 4.0 - , with attribution as contributors of Open Imagery Network. - All imagery is available to be traced in OpenStreetMap. + , with attribution as contributors of Open Imagery Network, + unless further specified by a specific license. All imagery + is available to be traced in OpenStreetMap.

From b14b9bfa9c890dabb5a583d2a20001c3841e367f Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Fri, 30 Nov 2018 09:14:09 +0000 Subject: [PATCH 3/4] fix lint --- src/components/uploader/home.js | 12 +++++------- src/components/user_page.js | 4 +++- src/utils/ds_zoom.js | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/uploader/home.js b/src/components/uploader/home.js index 913aa83e..77bc599c 100644 --- a/src/components/uploader/home.js +++ b/src/components/uploader/home.js @@ -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, @@ -479,9 +477,9 @@ export default createReactClass({ CC-BY 4.0 - , with attribution as contributors of Open Imagery Network, - unless further specified by a specific license. All imagery - is available to be traced in OpenStreetMap. + , with attribution as contributors of Open Imagery Network, + unless further specified by a specific license. All imagery is + available to be traced in OpenStreetMap.

diff --git a/src/components/user_page.js b/src/components/user_page.js index a1e9ba07..7ae63e02 100644 --- a/src/components/user_page.js +++ b/src/components/user_page.js @@ -109,7 +109,9 @@ export default createReactClass({
  • {this.requestedUser === "current" ? ( - Edit{" "} + + Edit + {" "} |  ) : null} diff --git a/src/utils/ds_zoom.js b/src/utils/ds_zoom.js index f3da3f93..fb8aadc3 100644 --- a/src/utils/ds_zoom.js +++ b/src/utils/ds_zoom.js @@ -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); From 83b54b44e418ee307a6ee02a10a5dde210279f0b Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Thu, 13 Dec 2018 10:40:06 +0000 Subject: [PATCH 4/4] update language --- src/components/uploader/home.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/uploader/home.js b/src/components/uploader/home.js index 77bc599c..5f7a85f5 100644 --- a/src/components/uploader/home.js +++ b/src/components/uploader/home.js @@ -473,13 +473,22 @@ export default createReactClass({ Open Imagery Network (OIN) - . All imagery contained in OIN is licensed{" "} +

    +

    + Except when permitted by the OpenStreetMap exception (see + below), all imagery contained in OIN is licensed{" "} CC-BY 4.0 - , with attribution as contributors of Open Imagery Network, - unless further specified by a specific license. All imagery is - available to be traced in OpenStreetMap. + , with attribution as "© OIN contributors", and specific + additional SA/NC conditions if selected upon upload. +

    +

    + 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.