Improve line defaults and categories

data/locales.js

@@ -729,6 +729,10 @@ locale.en = {
                 "name": "Residential Road",
                 "terms": ""
             },
+            "highway/road": {
+                "name": "Unknown Road",
+                "terms": ""
+            },
             "highway/secondary": {
                 "name": "Secondary Road",
                 "terms": ""
@@ -1086,11 +1090,11 @@ locale.en = {
                 "terms": ""
             },
             "railway/abandoned": {
-                "name": "Abandoned railway",
+                "name": "Abandoned Railway",
                 "terms": ""
             },
             "railway/disused": {
-                "name": "Disused railway",
+                "name": "Disused Railway",
                 "terms": ""
             },
             "railway/level_crossing": {

data/presets.yaml

@@ -358,6 +358,9 @@ en:
       highway/residential: 
         name: Residential Road
         terms: ""
+      highway/road: 
+        name: Unknown Road
+        terms: ""
       highway/secondary: 
         name: Secondary Road
         terms: ""
@@ -626,10 +629,10 @@ en:
         name: Railway
         terms: ""
       railway/abandoned: 
-        name: Abandoned railway
+        name: Abandoned Railway
         terms: ""
       railway/disused: 
-        name: Disused railway
+        name: Disused Railway
         terms: ""
       railway/level_crossing: 
         name: Level Crossing

data/presets/categories.json

@@ -1,6 +1,5 @@
 [{
     "geometry": "line",
-    "icon": "highway",
     "id": "Road",
     "icon": "category-roads",
     "members": [
@@ -11,7 +10,46 @@
         "highway/secondary",
         "highway/tertiary",
         "highway/unclassified",
+        "highway/motorway_link",
+        "highway/trunk_link",
+        "highway/primary_link",
+        "highway/secondary_link",
+        "highway/tertiary_link",
         "highway/service",
-        "highway/track"
+        "highway/track",
+        "highway/road"
+    ]
+}, {
+    "geometry": "line",
+    "id": "Rail",
+    "icon": "railway-rail",
+    "members": [
+        "railway/rail",
+        "railway/subway",
+        "railway/tram",
+        "railway/monorail",
+        "railway/disused",
+        "railway/abandoned"
+    ]
+}, {
+    "geometry": "line",
+    "id": "Path",
+    "icon": "highway-path",
+    "members": [
+        "highway/footway",
+        "highway/cycleway",
+        "highway/bridleway",
+        "highway/path",
+        "highway/steps"
+    ]
+}, {
+    "geometry": "line",
+    "id": "Water",
+    "icon": "waterway-river",
+    "members": [
+        "waterway/river",
+        "waterway/stream",
+        "waterway/canal",
+        "waterway/ditch"
     ]
 }]

data/presets/defaults.json

@@ -15,11 +15,10 @@
     ],
     "line": [
         "Road",
-        "highway/footway",
-        "highway/cycleway",
-        "railway/rail",
-        "waterway/river",
-        "waterway/stream",
+        "Rail",
+        "Path",
+        "Water",
+        "power/line",
         "other"
     ],
     "point": [

data/presets/presets.json

@@ -1213,7 +1213,7 @@
         "name": "Motorway Link"
     },
     "highway/path": {
-        "icon": "highway-footway",
+        "icon": "highway-path",
         "fields": [
             "oneway",
             "structure",
@@ -1290,6 +1290,24 @@
         "terms": [],
         "name": "Residential Road"
     },
+    "highway/road": {
+        "icon": "highway-road",
+        "fields": [
+            "oneway",
+            "structure",
+            "access",
+            "maxspeed",
+            "surface"
+        ],
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "highway": "road"
+        },
+        "terms": [],
+        "name": "Unknown Road"
+    },
     "highway/secondary": {
         "icon": "highway-secondary",
         "fields": [
@@ -1497,7 +1515,7 @@
         "name": "Turning Circle"
     },
     "highway/unclassified": {
-        "icon": "highway",
+        "icon": "highway-unclassified",
         "fields": [
             "oneway",
             "structure",
@@ -2529,7 +2547,7 @@
             "structure"
         ],
         "terms": [],
-        "name": "Abandoned railway"
+        "name": "Abandoned Railway"
     },
     "railway/disused": {
         "icon": "railway-disused",
@@ -2543,7 +2561,7 @@
             "structure"
         ],
         "terms": [],
-        "name": "Disused railway"
+        "name": "Disused Railway"
     },
     "railway/level_crossing": {
         "icon": "cross",

data/presets/presets/highway/path.json

@@ -1,5 +1,5 @@
 {
-    "icon": "highway-footway",
+    "icon": "highway-path",
     "fields": [
         "oneway",
         "structure",

data/presets/presets/highway/road.json

@@ -0,0 +1,18 @@
+{
+    "icon": "highway-road",
+    "fields": [
+        "oneway",
+        "structure",
+        "access",
+        "maxspeed",
+        "surface"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "road"
+    },
+    "terms": [],
+    "name": "Unknown Road"
+}

data/presets/presets/highway/unclassified.json

@@ -1,5 +1,5 @@
 {
-    "icon": "highway",
+    "icon": "highway-unclassified",
     "fields": [
         "oneway",
         "structure",