Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add overview map of Sweden. #101

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
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
27 changes: 17 additions & 10 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,21 @@ paths = "paths/be"
rules = "rules/be"


#--- Czechia
#--- CH: Switzerland

[regions.ch]
paths = "paths/ch"
rules = "rules/ch"


#--- CZ: Czechia

[regions.cz]
paths = "paths/cz"
rules = "rules/cz"


#--- Germany
#--- DE: Germany

[regions.de-a]
paths = "paths/de/a"
Expand Down Expand Up @@ -319,16 +326,16 @@ detailed = true
gauge = 1520


#--- Slovenia
#--- SE: Sweden

[regions.si]
paths = "paths/si"
rules = "rules/si"
[regions.se]
paths = "paths/se"
rules = "rules/se"


#--- Switzerland
#--- SI: Slovenia

[regions.ch]
paths = "paths/ch"
rules = "rules/ch"
[regions.si]
paths = "paths/si"
rules = "rules/si"

2,855 changes: 1,431 additions & 1,424 deletions paths/no/d0.osm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions paths/no/d2.osm
Original file line number Diff line number Diff line change
Expand Up @@ -3345,8 +3345,8 @@
<node id='-61162267' action='modify' lat='63.35353435861' lon='12.03350539684' />
<node id='-61162268' action='modify' lat='63.34841424099' lon='12.03650947094' />
<node id='-61162269' action='modify' lat='63.3456035633' lon='12.04256053448' />
<node id='-61162270' action='modify' lat='63.33793055502' lon='12.05721612453' />
<node id='-61162271' action='modify' lat='63.33690027134' lon='12.0602416563'>
<node id='-61162270' action='modify' lat='63.33703959048' lon='12.05987151145' />
<node id='-61162271' action='modify' lat='63.33690869671' lon='12.06025104403'>
<tag k='name' v='kopg' />
</node>
<node id='-61162272' action='modify' lat='67.2522123749' lon='15.43170868278' />
Expand Down
1,023 changes: 1,023 additions & 0 deletions paths/se/d0.osm

Large diffs are not rendered by default.

3,078 changes: 3,078 additions & 0 deletions paths/se/d1.osm

Large diffs are not rendered by default.

24,374 changes: 24,374 additions & 0 deletions paths/se/d2.osm

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions rules/se/d0.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
with detail = 0 {
with link = "line.se.NHA" {
let na = path("d0.se.nha");

track(:first :cat:ac15 :pax, na[:nyn, :hem]);
track(:first :double :cat:ac15 :pax, na[:hem, :alv.yn]);
}

with link = "line.se.SHS" {
let sl = path("d0.se.shs");

track(:first :double :cat:ac15 :pax, sl[:sto, :upp.yg]);
track(:first :cat:ac15 :nopax, sl[:akr.yf, :ock.yg]);
track(:first :cat:ac15 :pax, sl[:ock.yg, :mog]);
track(:first :double :cat:ac15 :pax, sl[:mog, :hol]);
track(:first :cat:ac15 :pax, sl[:hol, :kil.ys]);
track(:first :double :cat:ac15 :pax, sl[:kil.ys, :bol]);
track(:first :cat:ac15 :pax, sl[:bol, :ram]);
track(:first :double :cat:ac15 :pax, sl[:ram, :bra.yg]);
track(:first :cat:ac15 :pax, sl[:bra.yg, :str]);
track(:first :pax, sl[:str, :stg]);
}

with link = "line.se.VSB" {
track(:first :double :cat:ac15 :pax, path("d0.se.vsb")[:sto, :got]);
}
}

6 changes: 6 additions & 0 deletions rules/se/d1/a.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.se.ASR" {
track(:second :nopax :suspended, path("d1.se.asr")[:ake.ys, :gru.ya]);
}
}

8 changes: 8 additions & 0 deletions rules/se/d1/e.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
with detail = 1 {
with link = "line.se.ESN" {
with zoom = :high {
track(:second :pax :removed, path("d1.se.esn")[:esk.ys, :esn]);
}
}
}

15 changes: 15 additions & 0 deletions rules/se/d1/f.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
with detail = 1 {
with link = "line.se.FLJ" {
track(:first :double :cat:ac15 :pax, path("d1.se.flj")[:fle.yj, :sos]);
}

with link = "line.se.FKP" {
let fk = path("d1.se.fkp");

track(:first :cat:ac15 :nopax, fk[:fro, :jad.y]);
track(:first :cat:ac15 :pax, fk[:jad.y, :arb]);
track(:first :double :cat:ac15 :pax, fk[:arb, :val.ye]);
track(:first :cat:ac15 :pax, fk[:val.ye, :kop]);
}
}

6 changes: 6 additions & 0 deletions rules/se/d1/j.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.se.JAB" {
track(:first :cat:ac15 :pax, path("d1.se.jab")[:jar.ya, :aby]);
}
}

13 changes: 13 additions & 0 deletions rules/se/d1/k.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
with detail = 1 {
with link = "line.se.KMV" {
track(:second :g600 :pax :removed, path("d1.se.kmv")[:kol, :vir]);
}

with link = "line.se.KUR" {
let kk = path("d1.se.kur");

track(:second :g1093 :pax :removed, kk[:kop.yr, :rid]);
track(:second :g1093 :nopax :removed, kk[:rid, :kal]);
}
}

6 changes: 6 additions & 0 deletions rules/se/d1/m.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
with detail = 1 {
with link = "line.se.MFL" {
track(:second :g600 :museum, path("d1.se.mfl")[:maa, :lag.ym]);
}
}

9 changes: 9 additions & 0 deletions rules/se/d1/n.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
with detail = 1 {
with link = "line.se.NHA" {
let na = path("d1.se.nha");

track(:first :cat:ac15 :pax, na[:nyn, :hem]);
track(:first :double :cat:ac15 :pax, na[:hem, :alv.yn]);
}
}

12 changes: 12 additions & 0 deletions rules/se/d1/o.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
with detail = 1 {
with link = "line.se.OXV" {
let ov = path("d1.se.oxv");

track(:first :cat:ac15 :nopax, ov[:oxe, :nyk.yo]);
track(:first :cat:ac15 :nopax, ov[:nyk.yf, :flo]);
track(:first :cat:ac15 :pax, ov[:flo, :esk.ys]);
track(:first :double :cat:ac15 :pax, ov[:esk.ys, :fol]);
track(:first :cat:ac15 :pax, ov[:fol, :val.ye]);
}
}

12 changes: 12 additions & 0 deletions rules/se/d1/r.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
with detail = 1 {
with link = "line.se.RHL" {
track(:second :g1093 :nopax :removed,
path("d1.se.rhl")[:rid.yl, :ler]
);
}

with link = "line.se.RKB" {
track(:first :cat:ac15 :pax, path("d1.se.rkb")[:rek.yk, :kol.yr]);
}
}

51 changes: 51 additions & 0 deletions rules/se/d1/s.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
with detail = 1 {
with link = "line.se.SET" {
let se = path("d1.se.set");

with railway = :first :cat:ac15 :pax {
track(se[:sos, :nyk]);
track(:double, se[:nyk, :lag]);
track(se[:lag, :str]);
track(:double, se[:str, :har]);
track(se[:har, :esk.ys]);
}
}

with link = "line.se.SHC", zoom = :high {
track(:first :double :cat:ac15 :pax, path("d1.se.shc")[:soh.yc, :soc]);
}

with link = "line.se.SHS" {
let sl = path("d1.se.shs");

track(:first :double :cat:ac15 :pax, sl[:sto, :upp.yg]);
track(:first :cat:ac15 :pax, sl[:upp.yg, :akr.yr]);
track(:first :cat:ac15 :nopax, sl[:akr.yr, :stv.yf]);
track(:first :cat:ac15 :pax, sl[:stv.yf, :stv.yg]);
track(:first :cat:ac15 :nopax, sl[:stv.yg, :ock.yg]);
track(:first :cat:ac15 :pax, sl[:ock.yg, :mog]);
track(:first :double :cat:ac15 :pax, sl[:mog, :hol]);
track(:first :cat:ac15 :pax, sl[:hol, :kil.ys]);
track(:first :double :cat:ac15 :pax, sl[:kil.ys, :bol]);
track(:first :cat:ac15 :pax, sl[:bol, :ram]);
track(:first :double :cat:ac15 :pax, sl[:ram, :bra.yg]);
track(:first :cat:ac15 :pax, sl[:bra.yg, :str]);
track(:first :pax, sl[:str, :stg]);
}

with link = "line.se.SMB" {
let sm = path("d1.se.smb");

track(:first :pax :removed, sm[:sos.yt, :nyk.yt]);
track(:first :pax :removed, sm[:nyk.ym, :tax]);
track(:second :g600 :museum, sm[:tax, :lag]);
track(:first :pax :removed, sm[:lag, :esk.ya]);
track(:second :nopax, sm[:hal.ym, :nyb]);
track(:first :removed, sm[:nyb, :mal]);
}

with link = "line.se.SSV" {
track(:second :pax :removed, path("d1.se.ssv")[:sta.ys, :ske.ys]);
}
}

11 changes: 11 additions & 0 deletions rules/se/d1/v.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
with detail = 1 {
with link = "line.se.VSB" {
let sg = path("d1.se.vsb");

with railway = :first :double :cat:ac15 :pax {
track(sg[:sto, :hal.yf]);
track(sg[:hal.yf, :got]);
}
}
}

25 changes: 25 additions & 0 deletions rules/se/d2/a.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# SE ASR. Åkers styckebruk - Strängnäs
with detail = 2 {
let as = path("d2.se.asr");

with railway = :second :nopax :suspended {
with link = "line.se.ASR" {
track(as[:ake.ys, :ake.ys + 3km]);
line_label(:left:e, as[:ake.ys + 3km], "ASR");
track(as[:ake.ys + 3km, :gru.ya]);
}
}

with railway = :second :pax :removed {
with link = "line.se.ASR" {
line_label(:left:ne, as[:gru.ya + 3km], "ASR");

track(as[:str.ys, :str]);
}

with link = "point.se.Strängnäs-gamla" {
statdot(as[:str]);
}
}
}

11 changes: 11 additions & 0 deletions rules/se/d2/c.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# SE CTY. Citybanan Stockolm.
with detail = 2 {
let ct = path("d2.se.cty");

with railway = :first :double :cat:ac15 :pax {
with link = "line.se.CTY" {
with layer = -1 track(ct[:tom.yc, :sts.yc]);
}
}
}

16 changes: 16 additions & 0 deletions rules/se/d2/e.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SE ESN. Eskilstuna södra - Eskilstuna norra
with detail = 2 {
let sn = path("d2.se.esn");

with railway = :second :pax :removed {
with link = "line.se.ESN" {
track(sn[:esk.yn, :esn]);
}

with link = "point.se.Eskilstuna-norra" {
statdot(sn[:esn]);
slabel(:right, sn[:esn] + (1.3dt, -0.5dt), "E. norra");
}
}
}

75 changes: 75 additions & 0 deletions rules/se/d2/f.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# SE FFO. Flen - Flens övre
with detail = 2 {
with link = "line.se.FFO" {
track(:first :cat:ac15 :pax, path("d2.se.ffo")[:fln.yo, :flo]);
}
}


# SE FLJ. Flemingsberg - Järna
with detail = 2 {
let fj = path("d2.se.flj");

with railway = :first :double :cat:ac15 :pax {
with link = "line.se.FLJ" {
track(fj[:fle.yj, :fle.yj + 8km]);
line_label(:left:nw, fj[:fle.yj + 8km], "FLJ");
track(fj[:fle.yj + 8km, :sos]);
}

with link = "point.se.Södertälje-syd-övre" {
track(:station :casing, fj[:sos, :sos.ya]);
statdot(fj[:sos]);
slabel(:nw, fj[:sos] + (0.5dt, 0.5dt), "S. syd");
}

with link = "line.se.FLJ" {
track(:casing, fj[:sos.ya, :sos.ya + 2km]);
with layer = -1 track(fj[:sos.ya + 2km, :jar.yf]);
}
}
}


# SE FKP. Frövi - Köping
with detail = 2 {
let fk = path("d2.se.fkp");

with railway = :first :cat:ac15 :nopax {
with link = "line.se.FKP" {
track(fk[:fro.ya, :fro.yk]);
track(fk[:fro.yk, :fro.yk + 9km]);
line_label(:left:s, fk[:fro.yk + 9km], (0.3dt, 0dt), "FKP");
track(fk[:fro.yk + 9km, :jad.y]);
}
}

with railway = :first :cat:ac15 :pax {
with link = "line.se.FKP" {
track(fk[:jad.y, :arb]);
}
}

with railway = :first :double :cat:ac15 :pax {
with link = "line.se.FKP" {
track(fk[:arb, :arb + 5km]);
line_label(:left:se, fk[:arb + 5km], "FKP");
track(fk[:arb + 5km, :val]);
}

with link = "point.se.Valskog" {
track(:station, fk[:val, :val.ye]);
statdot(:nopax, fk[:val]);
}
}

with railway = :first :cat:ac15 :pax {
with link = "line.se.FKP" {
track(fk[:val.ye, :val.ye + 5km]);
line_label(:right:w, fk[:val.ye + 5km], (0dt, 0.2dt), "FKP");
track(fk[:val.ye + 5km, :kop.yr]);
track(fk[:kop.yr, :kop]);
}
}
}

Loading