From 9debb550ac05e5fdf2a5c5896c38cc3ba3b6ddd7 Mon Sep 17 00:00:00 2001 From: Matthew Chase Whittemore Date: Fri, 2 Nov 2018 09:49:06 -0400 Subject: [PATCH 1/2] Add license for Navigator --- LICENSE.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/LICENSE.md b/LICENSE.md index a435f08d22c..fe0718d5d22 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,9 +1,17 @@ +The Mapbox Navigator dependency has the following license: + +Copyright © 2018 Mapbox, Inc. You may use this code with your Mapbox account and under the Mapbox Terms of Service (available at: https://www.mapbox.com/tos/). All other rights reserved. + +--- + Copyright © 2014–2018, Mapbox Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +--- + Copyright (c) 2016 Matthijs Hollemans and contributors Permission is hereby granted, free of charge, to any person obtaining a copy From 7fb2c014180a73e9ea64946943530f46145f88dd Mon Sep 17 00:00:00 2001 From: Matthew Chase Whittemore Date: Fri, 2 Nov 2018 17:12:50 -0400 Subject: [PATCH 2/2] clarify the nav-native dependency --- LICENSE.md | 8 -------- README.md | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index fe0718d5d22..a435f08d22c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,17 +1,9 @@ -The Mapbox Navigator dependency has the following license: - -Copyright © 2018 Mapbox, Inc. You may use this code with your Mapbox account and under the Mapbox Terms of Service (available at: https://www.mapbox.com/tos/). All other rights reserved. - ---- - Copyright © 2014–2018, Mapbox Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ---- - Copyright (c) 2016 Matthijs Hollemans and contributors Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/README.md b/README.md index f957f18e866..f5ecd8db026 100644 --- a/README.md +++ b/README.md @@ -141,3 +141,6 @@ We welcome feedback and code contributions! Please see [CONTRIBUTING.md](./CONTR ## License Mapbox Navigation SDK for iOS is released under the ISC License. See [LICENSE.md](https://github.com/mapbox/mapbox-navigation-ios/blob/master/LICENSE.md) for details. + +Mapbox Navigation SDK uses [Mapbox Navigator](https://github.com/mapbox/mapbox-navigation-ios/blob/master/Cartfile#L2), a private binary, as a dependency. The Mapbox Navigator binary may be used with a Mapbox account and under the [Mapbox TOS](https://www.mapbox.com/tos/). If you do not wish to use this binary, make sure you swap out this dependency in [./Cartfile](https://github.com/mapbox/mapbox-navigation-ios/blob/master/Cartfile#L2). Code in this repo falls under the [MIT license](./LICENSE.md). +