Merge pull request #325 from hannesj/patch-1

Improve mapping for railways

src/import-osm/mapping.yml

@@ -666,14 +666,14 @@ tables:
     - name: type
       type: mapping_value
     mapping:
+      station:
+      - subway
+      - light_rail
       railway:
       - station
       - halt
       - tram_stop
       - subway_entrance
-      station:
-      - subway
-      - light_rail
     type: point
   water_polygon:
     fields:

src/import-sql/classes/rail_station.yml

@@ -6,10 +6,10 @@ system:
     rail-metro:
     - stop
     - subway
-    - tram_stop
     rail-light:
     - light_rail
     - halt
+    - tram_stop
     entrance:
     - subway_entrance
-    
+    

src/import-sql/layers/road.sql

@@ -103,7 +103,6 @@ BEGIN
         WHEN class = 'track' THEN road_type_value(class, tracktype)
         WHEN class = 'service' THEN road_type_value(class, service)
         WHEN class = 'golf' THEN 'golf'
-        WHEN class IN ('major_rail', 'minor_rail') THEN 'rail'
         WHEN class = 'mtb' THEN 'mountain_bike'
         WHEN class = 'aerialway' AND type IN ('gondola', 'mixed_lift', 'chair_lift') THEN road_type_value(class, type)
         WHEN class = 'aerialway' AND type = 'cable_car' THEN 'aerialway:cablecar'