Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions paths/gb/a/d0.osm
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' upload='false' generator='JOSM'>
<node id='-60083815' action='modify' lat='56.48877686891' lon='-3.43927879361'>
<tag k='name' v='stj' />
</node>
<node id='-60083816' action='modify' lat='56.50997612352' lon='-3.45010928136' />
<node id='-60083817' action='modify' lat='57.47866061549' lon='-4.17997934536' />
<node id='-60083818' action='modify' lat='57.48168987014' lon='-4.22203366591'>
<tag k='name' v='inv' />
</node>
<node id='-60083821' action='modify' lat='57.27458524318' lon='-3.81964482099' />
<node id='-60083823' action='modify' lat='57.39174881367' lon='-4.07342880823' />
<node id='-60083825' action='modify' lat='56.93420450273' lon='-4.24154459673' />
<node id='-60083827' action='modify' lat='57.05420141333' lon='-4.12495855183' />
<node id='-60083829' action='modify' lat='56.75489530411' lon='-3.81384772483' />
<node id='-60083831' action='modify' lat='56.56585455133' lon='-3.61610233376' />
<node id='-60083833' action='modify' lat='56.81523057033' lon='-4.15265578902' />
<node id='-60083836' action='modify' lat='57.1014621681' lon='-3.97230168641' />
<node id='-60083844' action='modify' lat='56.85751213087' lon='-4.24862800411' />
<node id='-60083857' action='modify' lat='56.99495199811' lon='-4.17455399768' />
<node id='-60083864' action='modify' lat='57.18707694466' lon='-3.82930471555' />
<node id='-60083874' action='modify' lat='57.32086846703' lon='-3.96392617071' />
<node id='-60083880' action='modify' lat='56.76866346257' lon='-3.91819352326' />
<node id='-60083883' action='modify' lat='56.79512853815' lon='-4.02769422842' />
<node id='-60083889' action='modify' lat='56.6877411921' lon='-3.70692157449' />
<node id='-60083893' action='modify' lat='56.63570362148' lon='-3.64895061294' />
<way id='-18648711' action='modify'>
<nd ref='-60083815' />
<nd ref='-60083816' />
<tag k='type' v='straight' />
</way>
<way id='-18648716' action='modify'>
<nd ref='-60083817' />
<nd ref='-60083818' />
<tag k='type' v='straight' />
</way>
<way id='-18648719' action='modify'>
<nd ref='-60083816' />
<nd ref='-60083831' />
<nd ref='-60083893' />
<nd ref='-60083889' />
<nd ref='-60083829' />
<nd ref='-60083880' />
<nd ref='-60083883' />
<nd ref='-60083833' />
<nd ref='-60083844' />
<nd ref='-60083825' />
<nd ref='-60083857' />
<nd ref='-60083827' />
<nd ref='-60083836' />
<nd ref='-60083864' />
<nd ref='-60083821' />
<nd ref='-60083874' />
<nd ref='-60083823' />
<nd ref='-60083817' />
</way>
<relation id='-13996445' action='modify'>
<member type='way' ref='-18648711' role='' />
<member type='way' ref='-18648719' role='' />
<member type='way' ref='-18648716' role='' />
<tag k='key' v='d0.gb.hl' />
<tag k='name' v='D0 GB HL' />
<tag k='type' v='path' />
</relation>
</osm>
965 changes: 701 additions & 264 deletions paths/gb/a/d1.osm

Large diffs are not rendered by default.

12,899 changes: 6,444 additions & 6,455 deletions paths/gb/a/d2.osm

Large diffs are not rendered by default.

14,659 changes: 11,650 additions & 3,009 deletions paths/gb/a/d4.osm

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions rules/gb/a/d0.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
with detail = 0 {
with link = "line.gb.HL" {
let si = path("d0.gb.hl");

track(:first :pax, si[:stj, :inv]);
}
}

10 changes: 10 additions & 0 deletions rules/gb/a/d1/a.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
with detail = 1 {
with link = "line.gb.AI" {
let ai = path("d1.gb.ai");

track(:first :museum, ai[:avi, :bro]);
track(:first :removed, ai[:bro, :for]);
track(:first :pax, ai[:for, :mil.y]);
}
}

6 changes: 6 additions & 0 deletions rules/gb/a/d1/b.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.gb.BAF" {
track(:first :removed, path("d1.gb.baf")[:bal, :abe]);
}
}

6 changes: 6 additions & 0 deletions rules/gb/a/d1/d.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.gb.DNB" {
track(:third :removed, path("d1.gb.dnb")[:mou, :dor]);
}
}

17 changes: 17 additions & 0 deletions rules/gb/a/d1/h.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
with detail = 1 {
with link = "line.gb.HL" {
let si = path("d1.gb.hl");

track(:first :pax, si[:stj, :bla]);
track(:first :double :pax, si[:bla, :dal]);
track(:first :pax, si[:dal, :cul]);
track(:first :double :pax, si[:cul, :inv]);
}

with link = "point.gb.Inverness" {
slabel(:left :pax, path("d1.gb.hl")[:inv] + (2dt, 0.8dt),
hbox(:right:top, "Inverness")
);
}
}

6 changes: 6 additions & 0 deletions rules/gb/a/d1/k.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.gb.KYL" {
track(:first :pax, path("d1.gb.kyl")[:din.yk, :kyl]);
}
}

6 changes: 6 additions & 0 deletions rules/gb/a/d1/l.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.gb.LLR" {
track(:third :removed, path("d1.gb.llr")[:wic.yl, :lyb]);
}
}

6 changes: 6 additions & 0 deletions rules/gb/a/d1/m.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.gb.MOF" {
track(:first :removed, path("d1.gb.mof")[:mui, :for]);
}
}

74 changes: 38 additions & 36 deletions rules/gb/a/d2/a.map
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,46 @@ with detail = 2 {
}


# GB AFS. Aviemore - Forres
# GB AI. Aviemore - Forres - Millburn Junction
with detail = 2 {
let af = path("d2.gb.afs");
let ai = path("d2.gb.ai");

with link = "line.gb.AFS" {
track(:first :museum, af[:avi.yf, :bro]);
track(:first :removed, af[:bro, :for.ya]);

line_label(:right:w :museum, af[:avi.yf + 4km], "AFS");
line_badge(:removed, af[:bro + 15km], "AFS");
line_label(:right:nw :removed, af[:for.ya - 7km], "AFS");
with link = "line.gb.AI" {
track(:first :museum, ai[:avi.yf, :boa]);
line_label(:right:w :museum, ai[:avi.yf + 4km], "AI");
}

with link = "point.gb.Boat-of-Garten" {
statdot(:museum, af[:boa] >> 0.3dt);
slabel(:right :museum, af[:boa] + (1.8dt, 1.3dt), "Boat of Garten");
statdot(:museum, ai[:boa] >> 0.3dt);
slabel(:right :museum, ai[:boa] + (1.8dt, 1.3dt), "Boat of Garten");
}

with link = "line.gb.AI" {
track(:first :museum, ai[:boa, :bro]);
}

with link = "point.gb.Broomhill" {
statdot(:museum, af[:bro]);
slabel(:left :museum, af[:bro] + (-1.5dt, -0.3dt), "Broomhill");
statdot(:museum, ai[:bro]);
slabel(:left :museum, ai[:bro] + (-1.5dt, -0.3dt), "Broomhill");
}

with link = "line.gb.AI" {
track(:first :removed, ai[:bro, :for.ya]);
track(:first :pax, ai[:for.ya, :gol]);

line_badge(:removed, ai[:bro + 15km], "AI");
line_label(:right:nw :removed, ai[:for.ya - 7km], "AI");
line_badge(:pax, ai[:for.ya + 12km], "AI");
}

with link = "point.gb.Gollanfield" {
statdot(:pax, ai[:gol]);
slabel(:right :pax, ai[:gol] + (1.3dt, 2.8dt), "Gollanfield");
}

with link = "line.gb.AI" {
track(:first :pax, ai[:gol, :mil.y]);
line_badge(:pax, ai[:gol + 4.5km] @ -4 >> 0.1dt, "AI");
}
}

Expand All @@ -88,6 +107,12 @@ with detail = 2 {
with detail = 2 {
let fk = path("d2.gb.ani2");

with link = "point.gb.Forres" {
track(:first:station :pax, fk[:for.ya, :for]);
statdot(:pax, fk[:for]);
slabel(:left :pax, fk[:for] + (-1.5dt, -0.5dt), "Forres");
}

with link = "line.gb.ANI2" {
track(:first :pax, fk[:for, :kei]);

Expand All @@ -96,11 +121,6 @@ with detail = 2 {
line_label(:right:n :pax, fk[:kei - 5km], "ANI2");
}

with link = "point.gb.Forres" {
statdot(:pax, fk[:for]);
slabel(:left :pax, fk[:for] + (-1.5dt, -0.5dt), "Forres");
}

with link = "point.gb.Kinloss" {
statdot(:removed, fk[:kin]);
slabel(:right :removed, fk[:kin] + (-0.5dt, 0.8dt),
Expand Down Expand Up @@ -131,21 +151,3 @@ with detail = 2 {
}
}


# GB ANI3. Forres - Inverness
with detail = 2 {
let fi = path("d2.gb.ani3");

with link = "line.gb.ANI3" {
track(:first :pax, fi[:for, :mil.y]);

line_badge(:pax, fi[:for + 12km], "ANI3");
line_badge(:pax, fi[:gol + 4.5km] @ -4 >> 0.1dt, "ANI3");
}

with link = "point.gb.Gollanfield" {
statdot(:pax, fi[:gol]);
slabel(:right :pax, fi[:gol] + (1.3dt, 2.8dt), "Gollanfield");
}
}

65 changes: 65 additions & 0 deletions rules/gb/a/d2/b.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# GB BAF. Ballinluig - Aberfeldy
with detail = 2 {
let ba = path("d2.gb.baf");

with link = "line.gb.BAF" {
track(:first :removed, ba[:bal.ya, :abe]);

line_label(:right:s :removed, ba[:bal.ya + 8.5km], "BAF");
}

with link = "point.gb.Aberfeldy" {
statdot(:removed, ba[:abe]);
slabel(:left :removed, ba[:abe] + (-1.5dt, 1.0dt), "Aberfeldy");
}
}


# GB BGC. Craigellachie - Boat of Garten
with detail = 2 {
let cb = path("d2.gb.bgc");

with link = "line.gb.BGC" {
track(:first :removed,
cb[:cra.yb, :boa.yc - 2dt]
.. cb[:boa.yc, :boa] << 0.6dt
);

line_label(:left:w :removed, cb[:cra.yb + 17km], "BGC");
}
}


# GB BGD. Alves - Burghead
with detail = 2 {
let ab = path("d2.gb.bgd");

with link = "line.gb.BGD" {
track(:first :removed, ab[:alv.yb, :bur]);

line_label(:right:w :removed, ab[:alv.yb + 4km], "BGD");
}

with link = "point.gb.Burghead" {
statdot(:removed, ab[:bur]);
slabel(:left :removed, ab[:bur] + (-1.5dt, 0.5dt), "Burghead");
}
}


# GB BGF. Burghead - Hopeman
with detail = 2 {
let bh = path("d2.gb.bgf");

with link = "line.bg.BGF" {
track(:first :removed, bh[:bur, :hop]);

line_label(:left:s :removed, bh[:hop - 1.5km], "BGF");
}

with link = "point.gb.Hopeman" {
statdot(:removed, bh[:hop]);
slabel(:right :removed, bh[:hop] + (1.5dt, 0.8dt), "Hopeman");
}
}

35 changes: 35 additions & 0 deletions rules/gb/a/d2/d.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# GB DFS. Fodderty Junction - Strathpeffer
with detail = 2 {
let fs = path("d2.gb.dfs");

with link = "line.gb.DFS" {
track(:first :removed, fs[:fod, :str]);

line_label(:left:n :removed, fs[:fod + 1.5km], "DFS");
}

with link = "point.gb.Strathpeffer" {
statdot(:removed, fs[:str]);
slabel(:left :removed, fs[:str] + (1.0dt, 0.6dt),
hbox(:right:top, "Strathpeffer")
);
}
}


# GB DNB. The Mound - Dornoch
with detail = 2 {
let md = path("d2.gb.dnb");

with link = "line.gb.DNB" {
track(:first :removed, md[:mou.yd, :dor]);

line_label(:left:w :removed, md[:dor - 3.6km], "DNB");
}

with link = "point.gb.Dornoch" {
statdot(:removed, md[:dor]);
slabel(:bottom :removed, md[:dor] + (0dt, 0.7dt), "Dornoch");
}
}

17 changes: 17 additions & 0 deletions rules/gb/a/d2/e.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# GB ELB. Elgin - Lossiemouth
with detail = 2 {
let el = path("d2.gb.elb");

with link = "line.gb.ELB" {
track(:first :removed, el[:elg.yl, :los]);

line_badge(:removed, el[:los - 3.5km], "ELB");
}

with link = "point.gb.Lossiemouth" {
statdot(:removed, el[:los]);
slabel(:top :removed, el[:los] + (0dt, -0.7dt), "Lossiemouth");
}
}


16 changes: 16 additions & 0 deletions rules/gb/a/d2/g.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# GB GFG. Gollanfield - Fort George
with detail = 2 {
let gf = path("d2.gb.gfg");

with link = "line.gb.GFG" {
track(:first :removed, gf[:gol.yf, :fge]);

line_label(:left:e :removed, gf[:fge - 1.1km], "GFG");
}

with link = "point.gb.Fort-George" {
statdot(:removed, gf[:fge]);
slabel(:top :removed, gf[:fge] + (0dt, -0.6dt), "Fort George");
}
}

Loading