Changes between Version 48 and Version 49 of Styles/Maxspeed


Ignore:
Timestamp:
2025-01-02T17:34:17+01:00 (13 months ago)
Author:
Klumbumbus
Comment:

update to version 3.0 - code

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Maxspeed

    v48 v49  
    141141 5.3.2 - mph
    142142 5.4 - general rules
    143 6 - error reporting
    144  6.1 - report wrong value of maxspeed
    145  6.2 - report wrong value of maxspeed:conditional
    146  6.3 - report conditional maxspeed without default maxspeed
    147  6.4 - report if maxspeed direction is opposed to oneway direction
     1436 - display maxspeed values as text
     1447 - error reporting
     145 7.1 - report wrong value of maxspeed
     146 7.2 - report wrong value of maxspeed:conditional
     147 7.3 - report conditional maxspeed without default maxspeed
     148 7.4 - report wrong value of maxspeed:advisory
     149 7.5 - report if maxspeed direction is opposed to oneway direction
    148150 
    149151*/
    … …  
    155157{
    156158        title: "Maxspeed";
    157         version: "2.9.[[revision]]_[[date]]";
     159        version: "3.0.[[revision]]_[[date]]";
    158160        description: "Display maxspeed values of ways in the map view.";
    159161        icon: "maxspeed_icon.svg";
    … …  
    177179  label: tr("Support implicit maxspeed values, e.g. RO:urban (only in BY, FR, RO, RU, RS)");
    178180  default: false;
     181}
     182setting::textdisplay {
     183  type: boolean;
     184  label: tr("Display maxspeed values as text");
     185  default: true;
    179186}
    180187
    … …  
    15151522/*************************************/
    15161523
    1517 /* 6 - error reporting */
    1518 /* 6.1 - report wrong value of maxspeed */
    1519 way[maxspeed=~/^[0-9]+$/]::maxspeedlayer,
    1520 way[maxspeed=signals]::maxspeedlayer,
    1521 way[maxspeed=none]::maxspeedlayer,
    1522 way[maxspeed=~/^[0-9]+ mph$/]::maxspeedlayer,
    1523 way[maxspeed=~/^[0-9]+ km\/h$/]::maxspeedlayer,
    1524 way[maxspeed=~/^[0-9]+ knots$/]::maxspeedlayer,
    1525 way[maxspeed=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedlayer,
    1526 way[maxspeed=~/^(FR):(zone30)/][setting("implicit")]::maxspeedlayer,
    1527 way[maxspeed=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedlayer,
    1528 way[maxspeed=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedlayer
     1524/* 6 - display maxspeed values as text (text always in default layer) */
     1525way[setting("textdisplay")][maxspeed]
     1526{
     1527        maxspeedvalues: tag(maxspeed);
     1528    set text_available;
     1529}
     1530way[setting("textdisplay")][maxspeed:forward]
     1531{
     1532        maxspeedvalues: concat(prop(maxspeedvalues), "  fw", tag("maxspeed:forward"));
     1533    set text_available;
     1534}
     1535way[setting("textdisplay")][maxspeed:backward]
     1536{
     1537        maxspeedvalues: concat(prop(maxspeedvalues), "  bw", tag("maxspeed:backward"));
     1538    set text_available;
     1539}
     1540
     1541/* get rid of the text after "@" as it can be a long text while keeping mph and knots */
     1542way[setting("textdisplay")][maxspeed:conditional]
     1543{
     1544        maxspeedvalues: concat(prop(maxspeedvalues), "  c", get(split(" @", tag("maxspeed:conditional")), 0));
     1545    set text_available;
     1546}
     1547way[setting("textdisplay")][maxspeed:forward:conditional]
     1548{
     1549        maxspeedvalues: concat(prop(maxspeedvalues), "  fwc", get(split(" @", tag("maxspeed:forward:conditional")), 0));
     1550    set text_available;
     1551}
     1552way[setting("textdisplay")][maxspeed:backward:conditional]
     1553{
     1554        maxspeedvalues: concat(prop(maxspeedvalues), "  bwc", get(split(" @", tag("maxspeed:backward:conditional")), 0));
     1555    set text_available;
     1556}
     1557
     1558way[setting("textdisplay")][maxspeed:advisory]
     1559{
     1560        maxspeedvalues: concat(prop(maxspeedvalues), "  a", tag("maxspeed:advisory"));
     1561    set text_available;
     1562}
     1563way[setting("textdisplay")][maxspeed:advisory:forward]
     1564{
     1565        maxspeedvalues: concat(prop(maxspeedvalues), "  afw", tag("maxspeed:advisory:forward"));
     1566    set text_available;
     1567}
     1568way[setting("textdisplay")][maxspeed:advisory:backward]
     1569{
     1570        maxspeedvalues: concat(prop(maxspeedvalues), "  abw", tag("maxspeed:advisory:backward"));
     1571    set text_available;
     1572}
     1573
     1574/* display "v" only for the values yes or other reasons (as the reason can be a long text), but not for value no */
     1575way[setting("textdisplay")][maxspeed:variable][maxspeed:variable!=no]
     1576{
     1577        maxspeedvalues: concat(prop(maxspeedvalues), "  v");
     1578    set text_available;
     1579}
     1580way[setting("textdisplay")][maxspeed:variable:forward][maxspeed:variable:forward!=no]
     1581{
     1582        maxspeedvalues: concat(prop(maxspeedvalues), "  vfw");
     1583    set text_available;
     1584}
     1585way[setting("textdisplay")][maxspeed:variable:backward][maxspeed:variable:backward!=no]
     1586{
     1587        maxspeedvalues: concat(prop(maxspeedvalues), "  vbw");
     1588    set text_available;
     1589}
     1590
     1591way|z18-[setting("textdisplay")].text_available
     1592{
     1593        font-size: 13;
     1594        text-color: black;
     1595        text-halo-radius: 2;
     1596        text-halo-color: white;
     1597    text: prop(maxspeedvalues);
     1598}
     1599
     1600
     1601/*************************************/
     1602
     1603/* 7 - error reporting (text always in default layer, overwrites text: prop(maxspeedvalues))*/
     1604/* 7.1 - report wrong value of maxspeed (knots has no style support but should not produce a warning anyway) */
     1605way[maxspeed=~/^[1-9][0-9]*( mph| knots)?$/],
     1606way[maxspeed=signals],
     1607way[maxspeed=none],
     1608way[maxspeed=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")],
     1609way[maxspeed=~/^(FR):(zone30)/][setting("implicit")],
     1610way[maxspeed=~/^(RO|RS):(trunk)/][setting("implicit")],
     1611way[maxspeed=~/^(BY|RS|RU):(living_street)/][setting("implicit")]
    15291612{
    15301613        set correct_value;
    15311614}
    1532 way[maxspeed:forward=~/^[0-9]+$/]::maxspeedcasinglayer,
    1533 way[maxspeed:forward=signals]::maxspeedcasinglayer,
    1534 way[maxspeed:forward=none]::maxspeedcasinglayer,
    1535 way[maxspeed:forward=~/^[0-9]+ mph$/]::maxspeedcasinglayer,
    1536 way[maxspeed:forward=~/^[0-9]+ km\/h$/]::maxspeedcasinglayer,
    1537 way[maxspeed:forward=~/^[0-9]+ knots$/]::maxspeedcasinglayer,
    1538 way[maxspeed:forward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedcasinglayer,
    1539 way[maxspeed:forward=~/^(FR):(zone30)/][setting("implicit")]::maxspeedcasinglayer,
    1540 way[maxspeed:forward=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedcasinglayer,
    1541 way[maxspeed:forward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedcasinglayer
     1615way[maxspeed:forward=~/^[1-9][0-9]*( mph| knots)?$/],
     1616way[maxspeed:forward=signals],
     1617way[maxspeed:forward=none],
     1618way[maxspeed:forward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")],
     1619way[maxspeed:forward=~/^(FR):(zone30)/][setting("implicit")],
     1620way[maxspeed:forward=~/^(RO|RS):(trunk)/][setting("implicit")],
     1621way[maxspeed:forward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]
    15421622{
    15431623        set correct_value_forward;
    15441624}
    1545 way[maxspeed:backward=~/^[0-9]+$/]::maxspeedcasinglayer,
    1546 way[maxspeed:backward=signals]::maxspeedcasinglayer,
    1547 way[maxspeed:backward=none]::maxspeedcasinglayer,
    1548 way[maxspeed:backward=~/^[0-9]+ mph$/]::maxspeedcasinglayer,
    1549 way[maxspeed:backward=~/^[0-9]+ km\/h$/]::maxspeedcasinglayer,
    1550 way[maxspeed:backward=~/^[0-9]+ knots$/]::maxspeedcasinglayer,
    1551 way[maxspeed:backward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")]::maxspeedcasinglayer,
    1552 way[maxspeed:backward=~/^(FR):(zone30)/][setting("implicit")]::maxspeedcasinglayer,
    1553 way[maxspeed:backward=~/^(RO|RS):(trunk)/][setting("implicit")]::maxspeedcasinglayer,
    1554 way[maxspeed:backward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]::maxspeedcasinglayer
     1625way[maxspeed:backward=~/^[1-9][0-9]*( mph| knots)?$/],
     1626way[maxspeed:backward=signals],
     1627way[maxspeed:backward=none],
     1628way[maxspeed:backward=~/^(BY|FR|RO|RS|RU):(urban|rural|motorway)/][setting("implicit")],
     1629way[maxspeed:backward=~/^(FR):(zone30)/][setting("implicit")],
     1630way[maxspeed:backward=~/^(RO|RS):(trunk)/][setting("implicit")],
     1631way[maxspeed:backward=~/^(BY|RS|RU):(living_street)/][setting("implicit")]
    15551632{
    15561633        set correct_value_backward;
    15571634}
    15581635
    1559 way["maxspeed"]!.correct_value::maxspeedlayer,
    1560 way["maxspeed:forward"]!.correct_value_forward::maxspeedcasinglayer,
    1561 way["maxspeed:backward"]!.correct_value_backward::maxspeedcasinglayer
     1636way["maxspeed"]!.correct_value,
     1637way["maxspeed:forward"]!.correct_value_forward,
     1638way["maxspeed:backward"]!.correct_value_backward
    15621639{
    15631640        color: yellow;
    15641641        dashes-background-color: red;
    15651642        dashes: 4,24;
    1566         opacity: 1;
    15671643        width: 5;
    1568         text: tr("no correct value for maxspeed!");
     1644        text: tr("wrong maxspeed value!");
    15691645        text-color: black;
    15701646        font-size: 11;
    15711647        text-halo-color: red;
    15721648        text-halo-radius: 2;
    1573         casing-width: 1;
    1574         casing-color: yellow;
    1575 }
    1576 
    1577 /* 6.2 - report wrong value of maxspeed:conditional */
    1578 way["maxspeed:conditional"=~/^[1-9][0-9]* knots @ /]::maxspeedlayer,
    1579 way["maxspeed:forward:conditional"=~/^[1-9][0-9]* knots @ /]::maxspeedcasinglayer,
    1580 way["maxspeed:backward:conditional"=~/^[1-9][0-9]* knots @ /]::maxspeedcasinglayer
    1581 {
    1582         set cond_knots;
    1583 }
    1584 
    1585 way["maxspeed:conditional"]!.cond_kmh!.cond_mph!.cond_knots::maxspeedlayer,
    1586 way["maxspeed:forward:conditional"]!.cond_forward_kmh!.cond_forward_mph!.cond_knots::maxspeedcasinglayer,
    1587 way["maxspeed:backward:conditional"]!.cond_backward_kmh!.cond_backward_mph!.cond_knots::maxspeedcasinglayer
     1649        left-casing-width: 1;
     1650        left-casing-color: yellow;
     1651        right-casing-width: 1;
     1652        right-casing-color: yellow;
     1653        major-z-index: 3;
     1654}
     1655
     1656
     1657/* 7.2 - report wrong value of maxspeed:conditional */
     1658way["maxspeed:conditional"=~/^(none|[1-9][0-9]*( mph| knots)?) @ /]
     1659{
     1660        set correct_value_cond;
     1661}
     1662
     1663way["maxspeed:forward:conditional"=~/^(none|[1-9][0-9]*( mph| knots)?) @ /]
     1664{
     1665        set correct_value_forward_cond;
     1666}
     1667
     1668
     1669way["maxspeed:backward:conditional"=~/^(none|[1-9][0-9]*( mph| knots)?) @ /]
     1670{
     1671        set correct_value_backward_cond;
     1672}
     1673
     1674
     1675way["maxspeed:conditional"]!.correct_value_cond,
     1676way["maxspeed:forward:conditional"]!.correct_value_forward_cond,
     1677way["maxspeed:backward:conditional"]!.correct_value_backward_cond
    15881678{
    15891679        color: yellow;
    15901680        dashes-background-color: red;
    15911681        dashes: 4,24;
    1592         opacity: 1;
    15931682        width: 5;
    15941683        text: tr("wrong conditional maxspeed value!");
    … …  
    16011690        right-casing-width: 1;
    16021691        right-casing-color: yellow;
    1603         z-index: 1;
    1604 }
    1605 
    1606 /* 6.3 - report conditional maxspeed without default maxspeed */
    1607 way["maxspeed:conditional"][!"maxspeed"]::maxspeedlayer,
    1608 way["maxspeed:forward:conditional"][!"maxspeed:forward"][!"maxspeed"]::maxspeedcasinglayer,
    1609 way["maxspeed:backward:conditional"][!"maxspeed:backward"][!"maxspeed"]::maxspeedcasinglayer
     1692        major-z-index: 3;
     1693}
     1694
     1695/* 7.3 - report conditional maxspeed without default maxspeed */
     1696way["maxspeed:conditional"][!"maxspeed"],
     1697way["maxspeed:forward:conditional"][!"maxspeed:forward"][!"maxspeed"],
     1698way["maxspeed:backward:conditional"][!"maxspeed:backward"][!"maxspeed"]
    16101699{
    16111700        color: yellow;
    16121701        dashes-background-color: red;
    16131702        dashes: 4,24;
    1614         opacity: 1;
    16151703        width: 5;
    16161704        text: tr("conditional maxspeed without default maxspeed!");
    … …  
    16231711        right-casing-width: 1;
    16241712        right-casing-color: yellow;
    1625         left-casing-opacity: 1;
    1626         right-casing-opacity: 1;
    1627         z-index: 1;
    1628 
    1629 }
    1630 
    1631 /* 6.4 - report if maxspeed direction is opposed to oneway direction */
    1632 way["maxspeed:backward"][oneway?], /* in default layer to not hide the oneway arrows */
    1633 way["maxspeed:forward"][oneway=-1]
     1713        major-z-index: 3;
     1714
     1715}
     1716
     1717/* 7.4 - report wrong value of maxspeed:advisory */
     1718way[maxspeed:advisory=~/^[1-9][0-9]*( mph| knots)?$/]
     1719{
     1720        set correct_value_advisory;
     1721}
     1722way[maxspeed:advisory:forward=~/^[1-9][0-9]*( mph| knots)?$/]
     1723{
     1724        set correct_value_advisory_forward;
     1725}
     1726way[maxspeed:advisory:backward=~/^[1-9][0-9]*( mph| knots)?$/]
     1727{
     1728        set correct_value_advisory_backward;
     1729}
     1730
     1731way["maxspeed:advisory"]!.correct_value_advisory,
     1732way["maxspeed:advisory:forward"]!.correct_value_advisory_forward,
     1733way["maxspeed:advisory:backward"]!.correct_value_advisory_backward
    16341734{
    16351735        color: yellow;
    16361736        dashes-background-color: red;
    16371737        dashes: 4,24;
    1638         opacity: 1;
     1738        width: 5;
     1739        text: tr("wrong maxspeed:advisory value!");
     1740        text-color: black;
     1741        font-size: 11;
     1742        text-halo-color: red;
     1743        text-halo-radius: 2;
     1744        left-casing-width: 1;
     1745        left-casing-color: yellow;
     1746        right-casing-width: 1;
     1747        right-casing-color: yellow;
     1748        major-z-index: 3;
     1749}
     1750
     1751/* 7.5 - report if maxspeed direction is opposed to oneway direction */
     1752way["maxspeed:backward"][oneway?],
     1753way["maxspeed:forward"][oneway=-1]
     1754{
     1755        color: yellow;
     1756        dashes-background-color: red;
     1757        dashes: 4,24;
    16391758        width: 5;
    16401759        text: tr("maxspeed opposed to oneway direction!");
    … …  
    16431762        text-halo-color: red;
    16441763        text-halo-radius: 2;
    1645         casing-width: 1;
    1646         casing-color: yellow;
     1764        left-casing-width: 1;
     1765        left-casing-color: yellow;
     1766        right-casing-width: 1;
     1767        right-casing-color: yellow;
     1768        major-z-index: 3;
    16471769}
    16481770}}}