From da7faf0a8fe2a13d50f6f8b512a5dc638ec89dd5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 19 Jul 2021 16:07:30 +0200 Subject: [PATCH] Added cycle_barrier type, red turn --- assets/layers/crossings/crossings.json | 23 ++++++++ .../cycle_infra/Cycle_barrier_double.png | Bin 0 -> 1483 bytes .../cycle_infra/Cycle_barrier_single.png | Bin 0 -> 1281 bytes .../cycle_infra/Cycle_barrier_squeeze.png | Bin 0 -> 1911 bytes .../cycle_infra/Cycle_barrier_triple.png | Bin 0 -> 1725 bytes assets/themes/cycle_infra/cycle_infra.json | 18 ++++-- assets/themes/cycle_infra/license_info.json | 52 ++++++++++++++++++ langs/layers/en.json | 11 ++++ langs/layers/nl.json | 11 ++++ langs/themes/en.json | 9 ++- langs/themes/nl.json | 6 +- 11 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 assets/themes/cycle_infra/Cycle_barrier_double.png create mode 100644 assets/themes/cycle_infra/Cycle_barrier_single.png create mode 100644 assets/themes/cycle_infra/Cycle_barrier_squeeze.png create mode 100644 assets/themes/cycle_infra/Cycle_barrier_triple.png create mode 100644 assets/themes/cycle_infra/license_info.json diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 874d55a81e..4521e57d9d 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -218,6 +218,29 @@ } } ] + }, + { + "question": { + "en": "Can a cyclist turn right when the light is red?", + "nl": "Mag een fietser rechtsaf slaan als het licht rood is?" + }, + "condition": "highway=traffic_signals", + "mappings": [ + { + "if": "red_turn:right:bicycle=yes", + "then": { + "en": "A cyclist can turn right if the light is red", + "nl": "Een fietser mag niet rechtsaf slaan als het licht rood is" + } + }, + { + "if": "red_turn:right:bicycle=no", + "then": { + "en": "A cyclist can not turn right if the light is red", + "nl": "Een fietser mag rechtsaf slaan als het licht rood is" + } + } + ] } ] } \ No newline at end of file diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.png b/assets/themes/cycle_infra/Cycle_barrier_double.png new file mode 100644 index 0000000000000000000000000000000000000000..76b51a2e65b01190fca289c2c803c982402de530 GIT binary patch literal 1483 zcmeAS@N?(olHy`uVBq!ia0y~yV9W$!W)3!>$aj&iML>!z$=lrpNCUx7=iT){inG8Y zvY3HEPZ@+6E0)@q0R`DhJbhi+pR#canOidL;T2+FV2$u}aSW-r_4bxwMhLsafsgOI zQcRje9Idz-Ly8pI1zw2g?$C&vmSE(%$JNSX!_p6JyQTTObQPU0KUI1zbVOBD-LX)M z<5AK_AurizN3V~1$%8r^#f)6!BN-b!m=!KDDDfiE9VQSymQ+o!QI%H$To77t_gZ=##S+n?KiDJo)LSRE0~fSEC|2tmpdu zx%K+!wf(Vo-bUSE=yf^Ld3*a}D`VksXB{c~)3+`r1dbw?f_7xdgDxqtndBQvwE%9<+0ntTrr-|P^-U(V2IQ|-EtQ|8LP zK*jg&J)dj!_1k?F&&L;U&GIOIP*Gr^(p0tKS)=vKrdGHUPzn?tuk8JUTjKMTm~~63tceQoTPuzPnqobEjnV zHA9=b@A~X}U0l*DE%nZxci*%l!(GW&@cn}Q@sXW%v));3-#0J+*pG^Rug~26y=QI5 zi*Hqhz_>qm{@kv`VwqjfF5bGeuJPVe|J_`U^ zv#w|T^w~9e*@km|{>MM9jlOyJ%Vc#yY3bj;r{3T5eg5?Tcj*0}S>mlG3rnApEx&Np${igjjEh0CJ8a@`a7^X;5= zg}UGTdxiJ3E0lO|%6^U5nIp&?w*ERWdEd(AmQ>>BgT&xqj5(yVLOtg_X#ONF_fP&` TX2szPpfcIh)z4*}Q$iB}1_mr@ literal 0 HcmV?d00001 diff --git a/assets/themes/cycle_infra/Cycle_barrier_single.png b/assets/themes/cycle_infra/Cycle_barrier_single.png new file mode 100644 index 0000000000000000000000000000000000000000..ec957da7c54a12e348f0ba55aad06c351ece7358 GIT binary patch literal 1281 zcmeAS@N?(olHy`uVBq!ia0y~yV9W$!W)3!>$aj&iML>!z$=lrpNCUx7=iT){inG8Y zvY3HEPZ@+6E0)@q0R`DhJbhi+pR#caS%@6??Yn}3fu+yW#WAGf*4taQ9?^jk4G;B~ zT1YJvakPr!QWAABn#$+oSg>(&Ny&*z7fqcfDXvbQ&f~Xmhl?P~!bbsIjSnU%HC@@r z5ybUsn%?&2r`MF0E>t~x|Fe!MGWk3#+FwI4ofl$YhwvhD5taLHJ-AD2bpUid>|S6vH%+YJ!F$EFjnd)jTI1F)F!# zeDUIn?VE+;&z*n2r|eqJvd8Y5H!E+H<5yFEeDhL}&CJ=-9p9^OWgTt*`}apxp`p<4 z&p&@y$ofAoDvztTFcsAg3w!kPP*ZpG688AiTHAYhdB>KYKK&!jQb{REM`_vdT;NNoSy#j-{w8PKk9!@ zHJ({S9a;C(re7XGkzZUoZ{5gBxNwKrJYHz-B zZNU0+nHP@t`uERVAGGu4{<~4WOLm`VKK#G*NucCf?usk_?4`FlY`?uO^SG>Y#ht*F zE;@Su{_RMf(QncAb4T)(J`1Vd`0wWn+dcUI#cpA5FRv)D`0@Ms!G#|DcV)M(fAIH- zcE#Vb;U8RPMSuEPW2HC!v{=hLZL#i`JEGP`O_2NaKwvbDf^#;BnKi+rhQ0U&bMj_s R<7=Rj%+uA+Wt~$(699s7w-o>Y literal 0 HcmV?d00001 diff --git a/assets/themes/cycle_infra/Cycle_barrier_squeeze.png b/assets/themes/cycle_infra/Cycle_barrier_squeeze.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ba6c7ed2f6d7370fad440bde9338e20d1b1612 GIT binary patch literal 1911 zcmeHI`BRfu6b*$27u;He5*Qf>n@d=f#jwTFSO`c^ih#%-#0FGMSV90nWsFrefdXUL zbReV_35AG4;DbR)8Cgt07EJ=tB4G&uLMVj9B>mLslpp*L+V|$pnS18lxijb9Iq%j< ztmlqxux$_sWCz9z?GJ%y;K9(`0tK0M-M@$+K%;#;(Gc~Adk>%&gUr^;US|>^5Nr5{ z&`71BQb1BW3FCWQdm6f3S4Zc9ZAd%FXkpOb2BdPue7h3?~kuOWdDWDu$qimIkWSxCc$>a3;ysljr5FnG3z=3h18a-R5Ax#EunlPs|n z!5vo?`AE&?d{yig2pR?{gzm;~!eg}>AM;OG2;GDqAA|Y-MITiAtPpR$K4q&lQXg19 zEt%@QTUGU9VBo}}psN~j_Hiu$xY7LgBM^w!k1w9R&HmHU4J(yO$!iN|>ge$A=ew+Sf8cpJ!C_EvT%Zc*U zxnxxH!@zoE=KIv|Jv~vgY2kTz5{X2mQvI!T9eX<9!y^PO<&tzpnh|A!A&NtqlSL~W zUi*{IX+ft_p{PRnWy(wp_A!Lr8&agb?VbFv_QObI+ppI$%Z7%AjNH=f0RRxCpu_4% z54*dox;2%&lYUri9XK+zVvcSuRk=%L?mV^)=2B1uryU+w7;7MiU_ENBc`;~S?qs8` zpitzcN`^8^t%}Inxy$CA!l!J7)7aU^=kuwZYfVi}Mn^A4PMEr(P}N}K5H`c-hwAC+ zl@2JX@Aj_0w#HVbxhmo2bD`Me6Bz+lbyZ6aT3I&%Ekc+lQWsg!kN>LF7nBWsYXAN*;zx_ z%Ep_>+w5p(XXoLUFPRo}S5VvGi3xy_uupH>jU*C@-q@JnizTnFuGWH!$BrftCI!j% z0N<67)ZUtc*pQ28(tIywE;#;;as7yQ?K%31#8&Ft)4{QBE@Gisx(`jq2-z&NNr;b+ zr%)(GF{2*9P~)Oii8nHRZ9yAgO`X1XlR_Eha;YBoe~XzEtoQnaw9q%vI47iy3R(gU< z)l1$x?_2J8j#K4U&9~f{!;bEoCiYFQ6e&<6mOGvL!1c&Ld(-@(+S)I9JW;z#;5P|^ ziECcWSUQBuwg0~4JG3M literal 0 HcmV?d00001 diff --git a/assets/themes/cycle_infra/Cycle_barrier_triple.png b/assets/themes/cycle_infra/Cycle_barrier_triple.png new file mode 100644 index 0000000000000000000000000000000000000000..b64f30c4feb7c9ebf79ae10832bcf468d8a3948a GIT binary patch literal 1725 zcmeAS@N?(olHy`uVBq!ia0y~yV9W$!W)3!>$aj&iML>!z$=lrpNCUx7=iT){inG8Y zvY3HEPZ@+6E0)@q0R`DhJbhi+pR#cand?fV-OLAS^zw9Z45_&F_LieZNTtkykN0&R z8n&u3-AwL&(8g@YacJI}1>OteTx@$^s9Lpb@iu6e8McVrdM%Gh4`mW zfBf~F-=_6+qc&G`@^H%w?5_z3yZC8+-F~FRkyE1)9O=YccVx8)hkC_Y$9TM z_HWyk^gUQSKPO@XTUKX>@%Q)c{~sj8tPRoOP?~#G_RHIuGjI4!nlY>E#oOMD+`HEI zZ_do~+dAu=)#pp+Z{O>y_+_#vd)Xz)($o}{y8XrKUQ7G80)7gSULIrd7Mn!k0uU`G}-(BnOiw^SF zu4f-NcXxk%ZhlsNe|K%|#ZZk1or!9z--T*@EU2`Md;jLhx~CcQdV6>EM=2#0mYKD6 z9o6vlk5-GvK!f9rPS*tM`b^JaFQK76?B3NTCA zL`GT~Twt#$SrDUlxAa-<%{^~bI*)sMEBzI%EI48A9MFG#&q~ejOXix)EKN*MND~*! z+WqqRd1W*6{%_j*E9cwiXK5`8>B>0!^wFsk9nxV-PR{D9v0K;MdsR;6+ZUO)f3_GJ my-%3Dv}69Q;gV5rJdgjxu=G~b-pGHTTFBGY&t;ucLK6T^w7-!6 literal 0 HcmV?d00001 diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index adb47c1689..9f257b28e7 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -813,22 +813,28 @@ { "if": "cycle_barrier:type=single", "then": { - "en": "Single, just two barriers with a space inbetween", - "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen" + "en": "Single, just two barriers with a space inbetween ", + "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen " } }, { "if": "cycle_barrier:type=double", "then": { - "en": "Double, two barriers behind each other", - "nl": "Dubbel, twee hekjes achter elkaar" + "en": "Double, two barriers behind each other ", + "nl": "Dubbel, twee hekjes achter elkaar " } }, { "if": "cycle_barrier:type=triple", "then": { - "en": "Triple, three barier behind each other", - "nl": "Drievoudig, drie hekjes achter elkaar" + "en": "Triple, three barier behind each other ", + "nl": "Drievoudig, drie hekjes achter elkaar " + } + }, + { + "if": "cycle_barrier:type=squeeze", + "then": { + "en": "Squeeze gate, gap is smaller at top, then at bottom " } } ] diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json new file mode 100644 index 0000000000..9efa074568 --- /dev/null +++ b/assets/themes/cycle_infra/license_info.json @@ -0,0 +1,52 @@ +[ + { + "authors": [ + "Supaplex030" + ], + "path": "Cycle_barrier_single.png", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_single.png" + ] + }, + { + "authors": [ + "Supaplex030" + ], + "path": "Cycle_barrier_double.png", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_double.png" + ] + }, + { + "authors": [ + "Supaplex030" + ], + "path": "Cycle_barrier_triple.png", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_triple.png" + ] + }, + { + "authors": [ + "Supaplex030" + ], + "path": "Cycle_barrier_angular.png", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_angular.png" + ] + }, + { + "authors": [ + "Supaplex030" + ], + "path": "Cycle_barrier_squeeze.png", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_squeeze.png" + ] + } +] \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 04122f5b79..afae48ada7 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -775,6 +775,17 @@ "then": "This traffic light does not have a button to request green light" } } + }, + "5": { + "question": "Can a cyclist turn right when the light is red?", + "mappings": { + "0": { + "then": "A cyclist can turn right if the light is red" + }, + "1": { + "then": "A cyclist can not turn right if the light is red" + } + } } } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 72d5473261..87545a440b 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -857,6 +857,17 @@ "then": "Dit verkeerlicht heeft niet een knop voor groen licht" } } + }, + "5": { + "question": "Mag een fietser rechtsaf slaan als het licht rood is?", + "mappings": { + "0": { + "then": "Een fietser mag niet rechtsaf slaan als het licht rood is" + }, + "1": { + "then": "Een fietser mag rechtsaf slaan als het licht rood is" + } + } } } }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 25e46f9aee..f493d8db25 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -981,13 +981,16 @@ "question": "What kind of cycling barrier is this?", "mappings": { "0": { - "then": "Single, just two barriers with a space inbetween" + "then": "Single, just two barriers with a space inbetween " }, "1": { - "then": "Double, two barriers behind each other" + "then": "Double, two barriers behind each other " }, "2": { - "then": "Triple, three barier behind each other" + "then": "Triple, three barier behind each other " + }, + "3": { + "then": "Squeeze gate, gap is smaller at top, then at bottom " } } }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index bb7e3ad5a6..eee69b7fdc 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -785,13 +785,13 @@ "question": "Wat voor fietshekjes zijn dit?", "mappings": { "0": { - "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen" + "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen " }, "1": { - "then": "Dubbel, twee hekjes achter elkaar" + "then": "Dubbel, twee hekjes achter elkaar " }, "2": { - "then": "Drievoudig, drie hekjes achter elkaar" + "then": "Drievoudig, drie hekjes achter elkaar " } } },