Merge pull request #6 from QwantResearch/caupias_201712

Update style with @caupias last changes

LICENSE.md

@@ -1,6 +1,34 @@
-## Code License
+## License
 
-The Mapbox GL Style JSON file is originally derived from [Lukas Martinelli OSM Liberty](https://github.com/lukasmartinelli/osm-liberty/blob/gh-pages/LICENSE.md) and [Klokantech GL Style](https://github.com/openmaptiles/klokantech-3d-gl-style/blob/master/LICENSE.md). The modified Mapbox GL Style JSON retains the same BSD license.
+The Mapbox GL Style JSON file is mainly inspirated by [OpenMapTiles OSM Bright](https://github.com/openmaptiles/osm-bright-gl-style), [Lukas Martinelli OSM Liberty](https://github.com/lukasmartinelli/osm-liberty/) and [Klokantech GL Style](https://github.com/openmaptiles/klokantech-3d-gl-style/).
+
+# Code license: BSD 3-Clause License
+The Mapbox GL Style JSON files in this repository and the code therein are licensed under the BSD license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA,Code OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Design license: CC-BY 4.0
 
@@ -9,10 +37,7 @@ the map) are licensed under the Creative Commons Attribution 4.0 license.
 
 To view a copy of the license, visit http://creativecommons.org/licenses/by/4.0/.
 
-Attribution for the design defined in this repository needs not to be provided
-on map images, but should be reasonably accessible from maps based on this style
-(for example, in a webpage linked from copyright notice on the map).
-
+# Tile schema : OpenMapTiles
 Products or services using maps derived from OpenMapTiles schema need to visibly
 credit "OpenMapTiles.org" or reference "OpenMapTiles" with a link to
 http://openmaptiles.org/.
@@ -31,7 +56,13 @@ by Klokan Technologies GmbH ([email protected]).
 The project contributors grant Klokan Technologies GmbH the license to give such
 exceptions on a commercial basis.
 
+# Fonts
+
+The fonts used are :
+* Open Sans, digitized data(c) 2010-2011, Google Corporation. Open Sans is licensed under the Apache License, Version 2.0. You may obtain a copy of the license at http://www.apache.org/licenses/LICENSE-2.0.
+* Noto Sans from Klokantech. This Font Software is licensed under the SIL Open Font License, Version 1.1. You may obtain a copy of the license at http://scripts.sil.org/OFL.
+
 
-## Icons
+# Icons
 
-OSM Liberty is using the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal.
+The icons are originally derived from the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal.