Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9837)
+++ trunk/data/defaultpresets.xml	(revision 9839)
@@ -2442,7 +2442,5 @@
         </item> <!-- Rail -->
         <item name="Narrow Gauge Rail" icon="styles/standard/transport/railway/narrow_gauge_rail.svg" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=light_rail" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:narrow_gauge" />
             <key key="railway" value="narrow_gauge" />
             <optional>
Index: trunk/data/validator/highway.mapcss
===================================================================
--- trunk/data/validator/highway.mapcss	(revision 9837)
+++ trunk/data/validator/highway.mapcss	(revision 9839)
@@ -110,2 +110,13 @@
   throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no");
 }
+
+/* #11270 */
+way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/] > node { set .is_in_railway }
+way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node[railway != crossing].is_in_railway {
+  throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}");
+  fixAdd: "railway=crossing";
+}
+way[highway =~ /^(bus_guideway|living_street|motorway|pedestrian|primary|raceway|residential|road|secondary|service|tertiary|track|trunk|unclassified)/] > node[railway != level_crossing].is_in_railway {
+  throwWarning: tr("railway crossing without {0}", "{0.tag}");
+  fixAdd: "railway=level_crossing";
+}