@@ -536,222 +536,223 @@ node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
536
536
set icon_z17;
537
537
}
538
538
539
- /****************/
539
+ /********************* /
540
540
/* area:highway tags */
541
- /****************/
541
+ /********************* /
542
542
543
- area["area:highway"=motorway]:closed {
543
+ area["area:highway"=" motorway" ]:closed {
544
544
fill-color: motorway#809bc0;
545
545
fill-opacity: setting("area_highway_opacity");
546
546
width: 1;
547
547
dashes: 9,3;
548
548
}
549
- area["area:highway"=motorway_link]:closed {
549
+ area["area:highway"=" motorway_link" ]:closed {
550
550
fill-color: motorway#809bc0;
551
551
fill-opacity: setting("area_highway_opacity");
552
552
width: 1;
553
553
dashes: 9,3;
554
554
}
555
- area["area:highway"=trunk]:closed {
555
+ area["area:highway"=" trunk" ]:closed {
556
556
fill-color: trunk#7fc97f;
557
557
fill-opacity: setting("area_highway_opacity");
558
558
width: 1;
559
559
dashes: 9,3;
560
560
}
561
- area["area:highway"=trunk_link]:closed {
561
+ area["area:highway"=" trunk_link" ]:closed {
562
562
fill-color: trunk#7fc97f;
563
563
fill-opacity: setting("area_highway_opacity");
564
564
width: 1;
565
565
dashes: 9,3;
566
566
}
567
- area["area:highway"=primary]:closed {
567
+ area["area:highway"=" primary" ]:closed {
568
568
fill-color: primary#fb805f;
569
569
fill-opacity: setting("area_highway_opacity");
570
570
width: 1;
571
571
dashes: 9,3;
572
572
}
573
- area["area:highway"=primary_link]:closed {
573
+ area["area:highway"=" primary_link" ]:closed {
574
574
fill-color: primary#fb805f;
575
575
fill-opacity: setting("area_highway_opacity");
576
576
width: 1;
577
577
dashes: 9,3;
578
578
}
579
- area["area:highway"=secondary]:closed {
579
+ area["area:highway"=" secondary" ]:closed {
580
580
fill-color: secondary#fdbf6f;
581
581
fill-opacity: setting("area_highway_opacity");
582
582
width: 1;
583
583
dashes: 9,3;
584
584
}
585
- area["area:highway"=secondary_link]:closed {
585
+ area["area:highway"=" secondary_link" ]:closed {
586
586
fill-color: secondary#fdbf6f;
587
587
fill-opacity: setting("area_highway_opacity");
588
588
width: 1;
589
589
dashes: 9,3;
590
590
}
591
- area["area:highway"=tertiary]:closed {
591
+ area["area:highway"=" tertiary" ]:closed {
592
592
fill-color: tertiary#f7f496;
593
593
fill-opacity: setting("area_highway_opacity");
594
594
width: 1;
595
595
dashes: 9,3;
596
596
}
597
- area["area:highway"=tertiary_link]:closed {
597
+ area["area:highway"=" tertiary_link" ]:closed {
598
598
fill-color: tertiary#f7f496;
599
599
fill-opacity: setting("area_highway_opacity");
600
600
width: 1;
601
601
dashes: 9,3;
602
602
}
603
- area["area:highway"=unclassified]:closed {
603
+ area["area:highway"=" unclassified" ]:closed {
604
604
fill-color: street#c0c0c0;
605
605
fill-opacity: setting("area_highway_opacity");
606
606
width: 1;
607
607
dashes: 9,3;
608
608
}
609
- area["area:highway"=residential]:closed {
609
+ area["area:highway"=" residential" ]:closed {
610
610
fill-color: street#c0c0c0;
611
611
fill-opacity: setting("area_highway_opacity");
612
612
width: 1;
613
613
dashes: 9,3;
614
614
}
615
- area["area:highway"=road]:closed {
615
+ area["area:highway"=" road" ]:closed {
616
616
fill-color: highway_road#770000;
617
617
fill-opacity: setting("area_highway_opacity");
618
618
width: 1;
619
619
dashes: 9,3;
620
620
}
621
- area["area:highway"=living_street]:closed {
621
+ area["area:highway"=" living_street" ]:closed {
622
622
fill-color: street#c0c0c0;
623
623
fill-opacity: setting("area_highway_opacity");
624
624
width: 1;
625
625
dashes: 9,3;
626
626
dashes-background-color: livingdashed#00ff00;
627
627
}
628
- area["area:highway"=pedestrian]:closed {
628
+ area["area:highway"=" pedestrian" ]:closed {
629
629
fill-color: foot#00ff00;
630
630
fill-opacity: setting("area_highway_opacity");
631
631
width: 1;
632
632
dashes: 9,3;
633
633
}
634
- area["area:highway"=raceway]:closed {
634
+ area["area:highway"=" raceway" ]:closed {
635
635
fill-color: raceway#ff80ff;
636
636
fill-opacity: setting("area_highway_opacity");
637
637
width: 1;
638
638
dashes: 9,3;
639
639
}
640
- area["area:highway"=service]:closed {
640
+ area["area:highway"=" service" ]:closed {
641
641
fill-color: service#809bc0;
642
642
fill-opacity: setting("area_highway_opacity");
643
643
width: 1;
644
644
dashes: 9,3;
645
645
}
646
- area["area:highway"=cycleway]:closed {
646
+ area["area:highway"=" cycleway" ]:closed {
647
647
fill-color: bicycle#b100ff;
648
648
fill-opacity: setting("area_highway_opacity");
649
649
width: 1;
650
650
dashes: 9,3;
651
651
}
652
- area["area:highway"=footway]:closed {
652
+ area["area:highway"=" footway" ]:closed {
653
653
fill-color: foot#00ff00;
654
654
fill-opacity: setting("area_highway_opacity");
655
655
width: 1;
656
656
dashes: 9,3;
657
657
}
658
- area["area:highway"=track]:closed {
658
+ area["area:highway"=" track" ]:closed {
659
659
fill-color: highway_track#6e541c;
660
660
fill-opacity: setting("area_highway_opacity");
661
661
width: 1;
662
662
dashes: 9,3;
663
663
}
664
- area["area:highway"=bridleway]:closed {
664
+ area["area:highway"=" bridleway" ]:closed {
665
665
fill-color: horse#a18559;
666
666
fill-opacity: setting("area_highway_opacity");
667
667
width: 1;
668
668
dashes: 9,3;
669
669
}
670
- area["area:highway"=path]:closed {
670
+ area["area:highway"=" path" ]:closed {
671
671
fill-color: foot#00ff00;
672
672
fill-opacity: setting("area_highway_opacity");
673
673
width: 1;
674
674
dashes: 9,3;
675
675
}
676
- area["area:highway"=construction]:closed {
676
+ area["area:highway"=" construction" ]:closed {
677
677
fill-color: construction#ffff00;
678
678
fill-opacity: setting("area_highway_opacity");
679
679
width: 1;
680
680
dashes: 9,3;
681
681
}
682
- area["area:highway"=steps]:closed {
682
+ area["area:highway"=" steps" ]:closed {
683
683
fill-color: foot#00ff00;
684
684
fill-opacity: setting("area_highway_opacity");
685
685
width: 1;
686
686
dashes: 9,3;
687
687
}
688
- area["area:highway"=bus_guideway]:closed {
688
+ area["area:highway"=" bus_guideway" ]:closed {
689
689
fill-color: rail#404040;
690
690
fill-opacity: setting("area_highway_opacity");
691
691
width: 1;
692
692
dashes: 9,3;
693
693
}
694
- area["area:highway"=escape]:closed {
694
+ area["area:highway"=" escape" ]:closed {
695
695
fill-color: street#c0c0c0;
696
696
fill-opacity: setting("area_highway_opacity");
697
697
width: 1;
698
698
dashes: 9,3;
699
699
}
700
- area["area:highway"=traffic_island]:closed {
700
+ area["area:highway"=" traffic_island" ]:closed {
701
701
fill-color: street#c0c0c0;
702
702
fill-opacity: setting("area_highway_opacity");
703
703
width: 1;
704
704
dashes: 9,3;
705
705
}
706
- area["area:highway"=platform]:closed {
706
+ area["area:highway"=" platform" ]:closed {
707
707
fill-color: highway_platform#c0c0c0;
708
708
fill-opacity: setting("area_highway_opacity");
709
709
width: 1;
710
710
dashes: 9,3;
711
711
}
712
- area["area:highway"=bus_stop]:closed {
712
+ area["area:highway"=" bus_stop" ]:closed {
713
713
fill-color: bus#89cbeb;
714
714
fill-opacity: setting("area_highway_opacity");
715
715
width: 1;
716
716
dashes: 9,3;
717
717
}
718
- area["area:highway"=busway]:closed {
718
+ area["area:highway"=" busway" ]:closed {
719
719
fill-color: bus#89cbeb;
720
720
fill-opacity: setting("area_highway_opacity");
721
721
width: 1;
722
722
dashes: 9,3;
723
723
}
724
- area["area:highway"=shoulder]:closed {
724
+ area["area:highway"=" shoulder" ]:closed {
725
725
fill-color: street#c0c0c0;
726
726
fill-opacity: setting("area_highway_opacity");
727
727
width: 1;
728
728
dashes: 9,3;
729
729
}
730
- area["area:highway"=emergency_bay]:closed {
730
+ area["area:highway"=" emergency_bay" ]:closed {
731
731
fill-color: street#c0c0c0;
732
732
fill-opacity: setting("area_highway_opacity");
733
733
width: 1;
734
734
dashes: 9,3;
735
735
}
736
- area["area:highway"=passing_place]:closed {
736
+ area["area:highway"=" passing_place" ]:closed {
737
737
fill-color: street#c0c0c0;
738
738
fill-opacity: setting("area_highway_opacity");
739
739
width: 1;
740
740
dashes: 9,3;
741
741
}
742
- area["area:highway"=turning_circle]:closed {
742
+ area["area:highway"=" turning_circle" ]:closed {
743
743
fill-color: street#c0c0c0;
744
744
fill-opacity: setting("area_highway_opacity");
745
745
width: 1;
746
746
dashes: 9,3;
747
747
}
748
- area["area:highway"=turning_loop]:closed {
748
+ area["area:highway"=" turning_loop" ]:closed {
749
749
fill-color: street#c0c0c0;
750
750
fill-opacity: setting("area_highway_opacity");
751
751
width: 1;
752
752
dashes: 9,3;
753
753
}
754
754
755
+
755
756
/****************/
756
757
/* highway tags */
757
758
/****************/
@@ -948,13 +949,7 @@ way[highway=raceway] {
948
949
way[highway=raceway][area?], relation[type=multipolygon][highway=raceway] {
949
950
fill-color: raceway#ff80ff;
950
951
}
951
- area[junction=yes] {
952
- fill-color: junction#c0c0c0;
953
- }
954
- node[junction=yes] {
955
- icon-image: "presets/vehicle/junction.svg";
956
- set icon_z17;
957
- }
952
+
958
953
node[highway=traffic_mirror] {
959
954
icon-image: "presets/vehicle/traffic_mirror.svg";
960
955
set icon_z17;
@@ -1197,6 +1192,15 @@ node[traffic_calming=mini_bumps] {
1197
1192
/* junction tag */
1198
1193
/****************/
1199
1194
1195
+ area["junction"][!"junction"?!] {
1196
+ set junctionArea;
1197
+ }
1198
+
1199
+ node[junction=yes] {
1200
+ icon-image: "presets/vehicle/junction.svg";
1201
+ set icon_z17;
1202
+ }
1203
+
1200
1204
node[junction=roundabout] {
1201
1205
icon-image: "presets/vehicle/restriction/roundabout_left.svg";
1202
1206
set icon_z17;
@@ -1206,6 +1210,30 @@ node:righthandtraffic[junction=roundabout] {
1206
1210
set icon_z17;
1207
1211
}
1208
1212
1213
+ area.junctionArea[!"area:highway"] {
1214
+ fill-color: junction#c0c0c0;
1215
+ }
1216
+
1217
+ /********************************/
1218
+ /* area:highway + junction tags */
1219
+ /********************************/
1220
+
1221
+ area.junctionArea["area:highway"]:closed {
1222
+ dashes-background-color: junction#c0c0c0;
1223
+ }
1224
+ area.junctionArea["area:highway"]:clockwise:closed {
1225
+ right-casing-width: 10;
1226
+ right-casing-color: junction#c0c0c0;
1227
+ right-casing-linejoin: miter;
1228
+ right-casing-opacity: setting("area_highway_opacity") + 0.1;
1229
+ }
1230
+ area.junctionArea["area:highway"]:anticlockwise:closed {
1231
+ left-casing-width: 10;
1232
+ left-casing-color: junction#c0c0c0;
1233
+ left-casing-linejoin: miter;
1234
+ left-casing-opacity: setting("area_highway_opacity") + 0.1;
1235
+ }
1236
+
1209
1237
/*****************/
1210
1238
/* cycleway tags */
1211
1239
/*****************/
0 commit comments