From a90a1a654ca566aa271ffa5263c869e86d9d41e2 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 4 Jun 2013 10:35:12 -0700 Subject: [PATCH] Add Route Master preset --- css/feature-icons.css | 1 + data/feature-icons.json | 2 +- data/presets.yaml | 5 + data/presets/categories.json | 1 + data/presets/categories/route.json | 1 + data/presets/fields.json | 5 + data/presets/fields/route_master.json | 5 + data/presets/presets.json | 13 + data/presets/presets/type/route_master.json | 13 + data/relation-icons.json | 3 +- dist/img/relation-presets.png | Bin 15849 -> 17817 bytes dist/locales/en.json | 7 + svg/relation-presets.svg | 526 +++++++++++++++++++- 13 files changed, 575 insertions(+), 7 deletions(-) create mode 100644 data/presets/fields/route_master.json create mode 100644 data/presets/presets/type/route_master.json diff --git a/css/feature-icons.css b/css/feature-icons.css index eaaa54923..d66bb5bfe 100644 --- a/css/feature-icons.css +++ b/css/feature-icons.css @@ -150,3 +150,4 @@ .preset-icon-relation.feature-route-ferry{background-position:-740px -25px;} .preset-icon-relation.feature-route-power{background-position:-800px -25px;} .preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;} +.preset-icon-relation.feature-route-master{background-position:-920px -25px;} diff --git a/data/feature-icons.json b/data/feature-icons.json index 75f97b13f..c98ddafd8 100644 --- a/data/feature-icons.json +++ b/data/feature-icons.json @@ -1 +1 @@ -{"airfield":{"12":[0,0],"18":[0,14],"24":[0,34]},"airport":{"12":[0,60],"18":[0,74],"24":[0,94]},"alcohol-shop":{"12":[0,120],"18":[0,134],"24":[0,154]},"america-football":{"12":[0,180],"18":[0,194],"24":[0,214]},"art-gallery":{"12":[0,240],"18":[0,254],"24":[0,274]},"bank":{"12":[0,300],"18":[0,314],"24":[0,334]},"bar":{"12":[0,360],"18":[0,374],"24":[0,394]},"baseball":{"12":[0,420],"18":[0,434],"24":[0,454]},"basketball":{"12":[0,480],"18":[0,494],"24":[0,514]},"beer":{"12":[0,540],"18":[0,554],"24":[0,574]},"bicycle":{"12":[0,600],"18":[0,614],"24":[0,634]},"building":{"12":[0,660],"18":[0,674],"24":[0,694]},"bus":{"12":[0,720],"18":[0,734],"24":[0,754]},"cafe":{"12":[0,780],"18":[0,794],"24":[0,814]},"campsite":{"12":[0,840],"18":[0,854],"24":[0,874]},"cemetery":{"12":[0,900],"18":[0,914],"24":[0,934]},"cinema":{"12":[0,960],"18":[0,974],"24":[0,994]},"circle":{"12":[0,1020],"18":[0,1034],"24":[0,1054]},"circle-stroked":{"12":[0,1080],"18":[0,1094],"24":[0,1114]},"city":{"12":[0,1140],"18":[0,1154],"24":[0,1174]},"college":{"12":[0,1200],"18":[0,1214],"24":[0,1234]},"commercial":{"12":[0,1260],"18":[0,1274],"24":[0,1294]},"cricket":{"12":[0,1320],"18":[0,1334],"24":[0,1354]},"cross":{"12":[0,1380],"18":[0,1394],"24":[0,1414]},"dam":{"12":[0,1440],"18":[0,1454],"24":[0,1474]},"danger":{"12":[0,1500],"18":[0,1514],"24":[0,1534]},"disability":{"12":[0,1560],"18":[0,1574],"24":[0,1594]},"embassy":{"12":[0,1620],"18":[0,1634],"24":[0,1654]},"emergency-telephone":{"12":[0,1680],"18":[0,1694],"24":[0,1714]},"farm":{"12":[0,1740],"18":[0,1754],"24":[0,1774]},"fast-food":{"12":[0,1800],"18":[0,1814],"24":[0,1834]},"ferry":{"12":[0,1860],"18":[0,1874],"24":[0,1894],"line":[2240,25]},"fire-station":{"12":[0,1920],"18":[0,1934],"24":[0,1954]},"fuel":{"12":[0,1980],"18":[0,1994],"24":[0,2014]},"garden":{"12":[0,2040],"18":[0,2054],"24":[0,2074]},"golf":{"12":[0,2100],"18":[0,2114],"24":[0,2134]},"grocery":{"12":[0,2160],"18":[0,2174],"24":[0,2194]},"harbor":{"12":[0,2220],"18":[0,2234],"24":[0,2254]},"heliport":{"12":[0,2280],"18":[0,2294],"24":[0,2314]},"hospital":{"12":[0,2340],"18":[0,2354],"24":[0,2374]},"industrial":{"12":[0,2400],"18":[0,2414],"24":[0,2434]},"land-use":{"12":[0,2460],"18":[0,2474],"24":[0,2494]},"library":{"12":[0,2520],"18":[0,2534],"24":[0,2554]},"lodging":{"12":[0,2580],"18":[0,2594],"24":[0,2614]},"logging":{"12":[0,2640],"18":[0,2654],"24":[0,2674]},"marker":{"12":[0,2700],"18":[0,2714],"24":[0,2734]},"marker-stroked":{"12":[0,2760],"18":[0,2774],"24":[0,2794]},"monument":{"12":[0,2820],"18":[0,2834],"24":[0,2854]},"museum":{"12":[0,2880],"18":[0,2894],"24":[0,2914]},"music":{"12":[0,2940],"18":[0,2954],"24":[0,2974]},"oil-well":{"12":[0,3000],"18":[0,3014],"24":[0,3034]},"park":{"12":[0,3060],"18":[0,3074],"24":[0,3094]},"park2":{"12":[0,3120],"18":[0,3134],"24":[0,3154]},"parking":{"12":[0,3180],"18":[0,3194],"24":[0,3214]},"parking-garage":{"12":[0,3240],"18":[0,3254],"24":[0,3274]},"pharmacy":{"12":[0,3300],"18":[0,3314],"24":[0,3334]},"pitch":{"12":[0,3360],"18":[0,3374],"24":[0,3394]},"place-of-worship":{"12":[0,3420],"18":[0,3434],"24":[0,3454]},"police":{"12":[0,3480],"18":[0,3494],"24":[0,3514]},"post":{"12":[0,3540],"18":[0,3554],"24":[0,3574]},"prison":{"12":[0,3600],"18":[0,3614],"24":[0,3634]},"rail":{"12":[0,3660],"18":[0,3674],"24":[0,3694]},"rail-above":{"12":[0,3720],"18":[0,3734],"24":[0,3754]},"rail-underground":{"12":[0,3780],"18":[0,3794],"24":[0,3814]},"religious-christian":{"12":[0,3840],"18":[0,3854],"24":[0,3874]},"religious-jewish":{"12":[0,3900],"18":[0,3914],"24":[0,3934]},"religious-muslim":{"12":[0,3960],"18":[0,3974],"24":[0,3994]},"restaurant":{"12":[0,4020],"18":[0,4034],"24":[0,4054]},"roadblock":{"12":[0,4080],"18":[0,4094],"24":[0,4114]},"school":{"12":[0,4140],"18":[0,4154],"24":[0,4174]},"shop":{"12":[0,4200],"18":[0,4214],"24":[0,4234]},"skiing":{"12":[0,4260],"18":[0,4274],"24":[0,4294]},"slaughterhouse":{"12":[0,4320],"18":[0,4334],"24":[0,4354]},"soccer":{"12":[0,4380],"18":[0,4394],"24":[0,4414]},"square":{"12":[0,4440],"18":[0,4454],"24":[0,4474]},"square-stroked":{"12":[0,4500],"18":[0,4514],"24":[0,4534]},"star":{"12":[0,4560],"18":[0,4574],"24":[0,4594]},"star-stroked":{"12":[0,4620],"18":[0,4634],"24":[0,4654]},"swimming":{"12":[0,4680],"18":[0,4694],"24":[0,4714]},"telephone":{"12":[0,4740],"18":[0,4754],"24":[0,4774]},"tennis":{"12":[0,4800],"18":[0,4814],"24":[0,4834]},"theatre":{"12":[0,4860],"18":[0,4874],"24":[0,4894]},"toilets":{"12":[0,4920],"18":[0,4934],"24":[0,4954]},"town":{"12":[0,4980],"18":[0,4994],"24":[0,5014]},"town-hall":{"12":[0,5040],"18":[0,5054],"24":[0,5074]},"triangle":{"12":[0,5100],"18":[0,5114],"24":[0,5134]},"triangle-stroked":{"12":[0,5160],"18":[0,5174],"24":[0,5194]},"village":{"12":[0,5220],"18":[0,5234],"24":[0,5254]},"warehouse":{"12":[0,5280],"18":[0,5294],"24":[0,5314]},"waste-basket":{"12":[0,5340],"18":[0,5354],"24":[0,5374]},"water":{"12":[0,5400],"18":[0,5414],"24":[0,5434]},"wetland":{"12":[0,5460],"18":[0,5474],"24":[0,5494]},"zoo":{"12":[0,5520],"18":[0,5534],"24":[0,5554]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]},"pipeline":{"line":[2300,25]},"relation":{"relation":[20,25]},"restriction":{"relation":[80,25]},"multipolygon":{"relation":[140,25]},"boundary":{"relation":[200,25]},"route":{"relation":[260,25]},"route-road":{"relation":[320,25]},"route-bicycle":{"relation":[380,25]},"route-foot":{"relation":[440,25]},"route-bus":{"relation":[500,25]},"route-train":{"relation":[560,25]},"route-detour":{"relation":[620,25]},"route-tram":{"relation":[680,25]},"route-ferry":{"relation":[740,25]},"route-power":{"relation":[800,25]},"route-pipeline":{"relation":[860,25]}} \ No newline at end of file +{"airfield":{"12":[0,0],"18":[0,14],"24":[0,34]},"airport":{"12":[0,60],"18":[0,74],"24":[0,94]},"alcohol-shop":{"12":[0,120],"18":[0,134],"24":[0,154]},"america-football":{"12":[0,180],"18":[0,194],"24":[0,214]},"art-gallery":{"12":[0,240],"18":[0,254],"24":[0,274]},"bank":{"12":[0,300],"18":[0,314],"24":[0,334]},"bar":{"12":[0,360],"18":[0,374],"24":[0,394]},"baseball":{"12":[0,420],"18":[0,434],"24":[0,454]},"basketball":{"12":[0,480],"18":[0,494],"24":[0,514]},"beer":{"12":[0,540],"18":[0,554],"24":[0,574]},"bicycle":{"12":[0,600],"18":[0,614],"24":[0,634]},"building":{"12":[0,660],"18":[0,674],"24":[0,694]},"bus":{"12":[0,720],"18":[0,734],"24":[0,754]},"cafe":{"12":[0,780],"18":[0,794],"24":[0,814]},"campsite":{"12":[0,840],"18":[0,854],"24":[0,874]},"cemetery":{"12":[0,900],"18":[0,914],"24":[0,934]},"cinema":{"12":[0,960],"18":[0,974],"24":[0,994]},"circle":{"12":[0,1020],"18":[0,1034],"24":[0,1054]},"circle-stroked":{"12":[0,1080],"18":[0,1094],"24":[0,1114]},"city":{"12":[0,1140],"18":[0,1154],"24":[0,1174]},"college":{"12":[0,1200],"18":[0,1214],"24":[0,1234]},"commercial":{"12":[0,1260],"18":[0,1274],"24":[0,1294]},"cricket":{"12":[0,1320],"18":[0,1334],"24":[0,1354]},"cross":{"12":[0,1380],"18":[0,1394],"24":[0,1414]},"dam":{"12":[0,1440],"18":[0,1454],"24":[0,1474]},"danger":{"12":[0,1500],"18":[0,1514],"24":[0,1534]},"disability":{"12":[0,1560],"18":[0,1574],"24":[0,1594]},"embassy":{"12":[0,1620],"18":[0,1634],"24":[0,1654]},"emergency-telephone":{"12":[0,1680],"18":[0,1694],"24":[0,1714]},"farm":{"12":[0,1740],"18":[0,1754],"24":[0,1774]},"fast-food":{"12":[0,1800],"18":[0,1814],"24":[0,1834]},"ferry":{"12":[0,1860],"18":[0,1874],"24":[0,1894],"line":[2240,25]},"fire-station":{"12":[0,1920],"18":[0,1934],"24":[0,1954]},"fuel":{"12":[0,1980],"18":[0,1994],"24":[0,2014]},"garden":{"12":[0,2040],"18":[0,2054],"24":[0,2074]},"golf":{"12":[0,2100],"18":[0,2114],"24":[0,2134]},"grocery":{"12":[0,2160],"18":[0,2174],"24":[0,2194]},"harbor":{"12":[0,2220],"18":[0,2234],"24":[0,2254]},"heliport":{"12":[0,2280],"18":[0,2294],"24":[0,2314]},"hospital":{"12":[0,2340],"18":[0,2354],"24":[0,2374]},"industrial":{"12":[0,2400],"18":[0,2414],"24":[0,2434]},"land-use":{"12":[0,2460],"18":[0,2474],"24":[0,2494]},"library":{"12":[0,2520],"18":[0,2534],"24":[0,2554]},"lodging":{"12":[0,2580],"18":[0,2594],"24":[0,2614]},"logging":{"12":[0,2640],"18":[0,2654],"24":[0,2674]},"marker":{"12":[0,2700],"18":[0,2714],"24":[0,2734]},"marker-stroked":{"12":[0,2760],"18":[0,2774],"24":[0,2794]},"monument":{"12":[0,2820],"18":[0,2834],"24":[0,2854]},"museum":{"12":[0,2880],"18":[0,2894],"24":[0,2914]},"music":{"12":[0,2940],"18":[0,2954],"24":[0,2974]},"oil-well":{"12":[0,3000],"18":[0,3014],"24":[0,3034]},"park":{"12":[0,3060],"18":[0,3074],"24":[0,3094]},"park2":{"12":[0,3120],"18":[0,3134],"24":[0,3154]},"parking":{"12":[0,3180],"18":[0,3194],"24":[0,3214]},"parking-garage":{"12":[0,3240],"18":[0,3254],"24":[0,3274]},"pharmacy":{"12":[0,3300],"18":[0,3314],"24":[0,3334]},"pitch":{"12":[0,3360],"18":[0,3374],"24":[0,3394]},"place-of-worship":{"12":[0,3420],"18":[0,3434],"24":[0,3454]},"police":{"12":[0,3480],"18":[0,3494],"24":[0,3514]},"post":{"12":[0,3540],"18":[0,3554],"24":[0,3574]},"prison":{"12":[0,3600],"18":[0,3614],"24":[0,3634]},"rail":{"12":[0,3660],"18":[0,3674],"24":[0,3694]},"rail-above":{"12":[0,3720],"18":[0,3734],"24":[0,3754]},"rail-underground":{"12":[0,3780],"18":[0,3794],"24":[0,3814]},"religious-christian":{"12":[0,3840],"18":[0,3854],"24":[0,3874]},"religious-jewish":{"12":[0,3900],"18":[0,3914],"24":[0,3934]},"religious-muslim":{"12":[0,3960],"18":[0,3974],"24":[0,3994]},"restaurant":{"12":[0,4020],"18":[0,4034],"24":[0,4054]},"roadblock":{"12":[0,4080],"18":[0,4094],"24":[0,4114]},"school":{"12":[0,4140],"18":[0,4154],"24":[0,4174]},"shop":{"12":[0,4200],"18":[0,4214],"24":[0,4234]},"skiing":{"12":[0,4260],"18":[0,4274],"24":[0,4294]},"slaughterhouse":{"12":[0,4320],"18":[0,4334],"24":[0,4354]},"soccer":{"12":[0,4380],"18":[0,4394],"24":[0,4414]},"square":{"12":[0,4440],"18":[0,4454],"24":[0,4474]},"square-stroked":{"12":[0,4500],"18":[0,4514],"24":[0,4534]},"star":{"12":[0,4560],"18":[0,4574],"24":[0,4594]},"star-stroked":{"12":[0,4620],"18":[0,4634],"24":[0,4654]},"swimming":{"12":[0,4680],"18":[0,4694],"24":[0,4714]},"telephone":{"12":[0,4740],"18":[0,4754],"24":[0,4774]},"tennis":{"12":[0,4800],"18":[0,4814],"24":[0,4834]},"theatre":{"12":[0,4860],"18":[0,4874],"24":[0,4894]},"toilets":{"12":[0,4920],"18":[0,4934],"24":[0,4954]},"town":{"12":[0,4980],"18":[0,4994],"24":[0,5014]},"town-hall":{"12":[0,5040],"18":[0,5054],"24":[0,5074]},"triangle":{"12":[0,5100],"18":[0,5114],"24":[0,5134]},"triangle-stroked":{"12":[0,5160],"18":[0,5174],"24":[0,5194]},"village":{"12":[0,5220],"18":[0,5234],"24":[0,5254]},"warehouse":{"12":[0,5280],"18":[0,5294],"24":[0,5314]},"waste-basket":{"12":[0,5340],"18":[0,5354],"24":[0,5374]},"water":{"12":[0,5400],"18":[0,5414],"24":[0,5434]},"wetland":{"12":[0,5460],"18":[0,5474],"24":[0,5494]},"zoo":{"12":[0,5520],"18":[0,5534],"24":[0,5554]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]},"pipeline":{"line":[2300,25]},"relation":{"relation":[20,25]},"restriction":{"relation":[80,25]},"multipolygon":{"relation":[140,25]},"boundary":{"relation":[200,25]},"route":{"relation":[260,25]},"route-road":{"relation":[320,25]},"route-bicycle":{"relation":[380,25]},"route-foot":{"relation":[440,25]},"route-bus":{"relation":[500,25]},"route-train":{"relation":[560,25]},"route-detour":{"relation":[620,25]},"route-tram":{"relation":[680,25]},"route-ferry":{"relation":[740,25]},"route-power":{"relation":[800,25]},"route-pipeline":{"relation":[860,25]},"route-master":{"relation":[920,25]}} \ No newline at end of file diff --git a/data/presets.yaml b/data/presets.yaml index 38dc744db..8b5fd23a2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -192,6 +192,8 @@ en: taoist: Taoist route: label: Type + route_master: + label: Type sac_scale: label: Path Difficulty service: @@ -1128,6 +1130,9 @@ en: type/route/tram: name: Tram Route terms: "" + type/route_master: + name: Route Master + terms: "" vertex: name: Other terms: "" diff --git a/data/presets/categories.json b/data/presets/categories.json index e83e5bd9e..68668320a 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -77,6 +77,7 @@ "type/route/power", "type/route/pipeline", "type/route/detour", + "type/route_master", "type/route" ] }, diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json index e9f288356..87d6d3c67 100644 --- a/data/presets/categories/route.json +++ b/data/presets/categories/route.json @@ -13,6 +13,7 @@ "type/route/power", "type/route/pipeline", "type/route/detour", + "type/route_master", "type/route" ] } \ No newline at end of file diff --git a/data/presets/fields.json b/data/presets/fields.json index f0f498937..c54556c5f 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -453,6 +453,11 @@ "type": "combo", "label": "Type" }, + "route_master": { + "key": "route_master", + "type": "combo", + "label": "Type" + }, "sac_scale": { "key": "sac_scale", "type": "combo", diff --git a/data/presets/fields/route_master.json b/data/presets/fields/route_master.json new file mode 100644 index 000000000..3efb0fedb --- /dev/null +++ b/data/presets/fields/route_master.json @@ -0,0 +1,5 @@ +{ + "key": "route_master", + "type": "combo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 4303115c5..bf725908f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -4661,6 +4661,19 @@ "name": "Tram Route", "icon": "route-tram" }, + "type/route_master": { + "geometry": [ + "relation" + ], + "tags": { + "type": "route_master" + }, + "name": "Route Master", + "icon": "route-master", + "fields": [ + "route_master" + ] + }, "vertex": { "name": "Other", "tags": {}, diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json new file mode 100644 index 000000000..d5e9f28d8 --- /dev/null +++ b/data/presets/presets/type/route_master.json @@ -0,0 +1,13 @@ +{ + "geometry": [ + "relation" + ], + "tags": { + "type": "route_master" + }, + "name": "Route Master", + "icon": "route-master", + "fields": [ + "route_master" + ] +} \ No newline at end of file diff --git a/data/relation-icons.json b/data/relation-icons.json index 2e6ad65de..79d4f115f 100644 --- a/data/relation-icons.json +++ b/data/relation-icons.json @@ -13,5 +13,6 @@ "route-tram": [680, 25], "route-ferry": [740, 25], "route-power": [800, 25], - "route-pipeline": [860, 25] + "route-pipeline": [860, 25], + "route-master": [920, 25] } diff --git a/dist/img/relation-presets.png b/dist/img/relation-presets.png index 6619ea91699a6d63e0465af61130aadf69a9b9b7..00c922b757c8c414452ff2eeb09af1bdd5d0f42e 100644 GIT binary patch literal 17817 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 diff --git a/dist/locales/en.json b/dist/locales/en.json index 0320566f5..3255bf010 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -620,6 +620,9 @@ "route": { "label": "Type" }, + "route_master": { + "label": "Type" + }, "sac_scale": { "label": "Path Difficulty" }, @@ -1874,6 +1877,10 @@ "name": "Tram Route", "terms": "" }, + "type/route_master": { + "name": "Route Master", + "terms": "" + }, "vertex": { "name": "Other", "terms": "" diff --git a/svg/relation-presets.svg b/svg/relation-presets.svg index 30a80c582..0953a252c 100644 --- a/svg/relation-presets.svg +++ b/svg/relation-presets.svg @@ -14,7 +14,7 @@ height="100" id="svg7013" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.4 r9939" sodipodi:docname="relation-presets.svg"> @@ -228,11 +228,11 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.70710678" - inkscape:cx="357.53037" - inkscape:cy="-94.26154" + inkscape:zoom="4" + inkscape:cx="819.66056" + inkscape:cy="31.76926" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g3421" showgrid="false" inkscape:window-width="1721" inkscape:window-height="881" @@ -2623,5 +2623,521 @@ id="rect25199-6" style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +