Update license for 2014 data

interactivethings · Apr 4, 2014 · 44a9478 · 44a9478
1 parent af42e12
commit 44a9478
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 12 deletions.
diff --git a/license/LICENSE → LICENSE b/license/LICENSE → LICENSE
diff --git a/LICENSE-GEODATA b/LICENSE-GEODATA
diff --git a/README.md b/README.md
@@ -141,18 +141,9 @@ Jeremy Stucki, [Interactive Things](http://interactivethings.com)
 
 ### Data Source
 
-Data source is the Swiss Federal Office of Topography, [swissBOUNDARIES3D](http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/landscape/swissBOUNDARIES3D.html) 2013.
-
-It is licensed under the following terms:
-
-> This agreement under public law in accordance with Article 12, paragraph 1b of the Swiss Federal Act of 5 October 2007 on Geoinformation (hereinafter referred to as Geoinformation Act) regulates access to, and use of, the federal geodata database.
->
-> By accepting this agreement, the licensee acknowledges all contractual provisions – in particular the scope of the licence and the contractual obligations – as well the applicability of Swiss federal legislation governing geoinformation.
->
-> By accepting this agreement, the licensee also acknowledges the sole right of the licensor to regulate access to, and use of, the federal geodata database. The attention of the licensee is herewith drawn to the fact that geodata may be protected under copyright law. The licensee thus acknowledges the exclusive right of the licensor to determine the use of the data.
-
-[Full license agreement](http://www.toposhop.admin.ch/en/shop/terms/use/finished_products)
+Data source is the Swiss Federal Office of Topography, [swissBOUNDARIES3D](http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/landscape/swissBOUNDARIES3D.html) 2014.
 
 ### License
 
-[BSD](license/LICENSE) (where the data source's license does not apply).
+* Geodata from swisstopo is licensed under the [Licence for the free geodata of the Federal Office of Topography swisstopo](LICENSE-GEODATA)
+* Everything else: [BSD](LICENSE)
diff --git a/license/DE-Lizenz-fuer-Fertigprodukte.pdf b/license/DE-Lizenz-fuer-Fertigprodukte.pdf
diff --git a/license/EN-Finished-products-licence.pdf b/license/EN-Finished-products-licence.pdf
diff --git a/license/FR-licence-pour-produits-finis.pdf b/license/FR-licence-pour-produits-finis.pdf
diff --git a/license/IT-Licenza-per-prodotti-finiti.pdf b/license/IT-Licenza-per-prodotti-finiti.pdf