Merge pull request #8 from metaodi/new-data

Add new data

CHANGELOG.md

@@ -5,11 +5,18 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Renamed /api/textiles to /api/textile to be consistent
 - The routes are now added in a hapi plugin to ensure they are all set when starting the server
+- Refactoring of loadData script to reduce duplicate code
+- Renamed `tram_station` parameter to `station`
+
 ### Added
+- New data for year 2015!
 - Tests for the whole public API to ensure it does not break entiertly
 - Upgrade to Hapi 8.0.0 and hapi-swagger 0.6.0
+- Added /api/tram_stops to serve the GeoJSON of all Cargo and E-Tram stops
+- Added `limit` parameter to be able to limit the amount of records returned by the API
 
 ## [0.1.0] - 2014-12-17
+### Added
 - Add metadata about the API
 
 ### Changed

csv/Entsorgung_Sammelstellen_2014.csv → csv/Entsorgung_Sammelstellen.csv

@@ -1,37 +1,37 @@
 "PLZ";"Sammelstelle";"Oel";"Glas";"Metall"
-8001;"Bahnhofquai vis à vis 5";;"X";"X"
+8001;"Bahnhofquai vis-à-vis 5";;"X";"X"
 8001;"Gessnerallee vis-à-vis 36";;"X";"X"
 8001;"Hirschengraben 22";;"X";"X"
 8002;"Am Schanzengraben 25 / Gartenstrasse";;"X";"X"
 8002;"Brunaustrasse 6 / Seestrasse";"X";"X";"X"
 8002;"Grütlistrasse 4";;"X";"X"
-8002;"Klopstockstrasse vis à vis 23";"X";"X";"X"
+8002;"Klopstockstrasse vis-à-vis 23";"X";"X";"X"
 8003;"Aegertenstrasse vis-à-vis 16";;"X";"X"
 8003;"Bertastrasse 60";;"X";"X"
 8003;"Fritschistrasse vis-à-vis 11";;"X";"X"
 8003;"Idaplatz 3";;"X";"X"
 8003;"Meinrad-Lienert-Strasse vis-à-vis 1 / Seebahnstrasse";;"X";"X"
 8003;"Schlossgasse vis-à-vis 22 / Steinstrasse";;"X";"X"
-8003;"Seebahnstrasse 89, Zweierstrasse 99";;"X";"X"
+8003;"Seebahnstrasse 89 / Zweierstrasse 99";;"X";"X"
 8003;"Zentralstrasse vis-à-vis 76";"X";"X";"X"
 8004;"Albisriederplatz 6 / Einfahrt Hardstrasse ";;"X";"X"
 8004;"Bullingerstrasse 69";;"X";"X"
 8004;"Erismannstrasse 31";"X";"X";"X"
 8004;"Hohlstrasse vis-à-vis 90";;"X";"X"
 8004;"Kanzleistrasse 137  / Hermann-Greulich-Strasse";;"X";"X"
 8004;"Kochstrasse 21";;"X";"X"
+8004;"Lagerstrasse 47";;"X";"X"
 8004;"Lochergut / Seebahnstrasse 171";;"X";"X"
-8004;"Militärstrasse 90";"X";"X";"X"
 8004;"Müllerstrasse 71";;"X";"X"
 8004;"St. Jakobstrasse vis-à-vis 29 / Lutherstrasse ";"X";"X";"X"
+8004;"Tellstrasse / Militärstrasse 90";"X";"X";"X"
 8004;"Weberstrasse 3";;"X";"X"
 8004;"Zimmerlistrasse vis-à-vis 4";;"X";"X"
 8005;"Hardturmweg / Hardturmstrasse 126";;"X";"X"
 8005;"Heinrichstrasse 180, unter Viadukt";"X";"X";"X"
 8005;"Josefstrasse 92";;"X";"X"
 8005;"Konradstrasse 79";;"X";"X"
 8005;"Röntgenstrasse 39";;"X";"X"
-8006;"Kronenstrasse 19 im Park";"X";"X";"X"
 8006;"Langmauerstrasse 90";;"X";"X"
 8006;"Letzistrasse vis-à-vis 50";;"X";"X"
 8006;"Rigi-Platz / Ottikerstrasse vis-à-vis 61";;"X";"X"
@@ -59,6 +59,7 @@
 8037;"Rebbergstrasse vis-à-vis 19";;"X";"X"
 8037;"Rosengartenstrasse 10, unter Rosengartenbrücke";;"X";"X"
 8037;"Rousseaustrasse vis-à-vis 102";"X";"X";"X"
+8037;"Wasserwerkstrasse 109";"X";"X";"X"
 8037;"Weihersteig 7 / Wibichstrasse, bei Kirche";;"X";"X"
 8038;"Alte Kalchbühlstrasse 15, bei Coop";"X";"X";"X"
 8038;"Etzelstrasse vis-à-vis 6";;"X";"X"
@@ -94,7 +95,7 @@
 8048;"Dachslerenstrasse 10 / Werkhof";"X";"X";"X"
 8048;"Ernst-Zöbeli-Strasse vis-à-vis 4";;"X";"X"
 8048;"Eugen-Huber-Strasse 4";;"X";"X"
-8048;"Hohlstrasse 465 / Letzipark";"X";"X";"X"
+8048;"Hardgutstrasse vis-à-vis 9";"X";"X";"X"
 8048;"Hohlstrasse 665 / Werdhölzlistrasse";;"X";"X"
 8048;"Lindenplatz 4 / Pfarrhausstrasse";;"X";"X"
 8048;"Loogartenstrasse 37 / Eugen-Huber-Strasse, Schulhaus";"X";"X";"X"