Changeset 17263 in josm


Ignore:
Timestamp:
2020-10-24T18:52:34+02:00 (5 weeks ago)
Author:
Klumbumbus
Message:

see #19383 - Add line_management to power support presets, warn about line_management on ways, deprecate pole:type and power related tower:type values

Location:
trunk/resources/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17259 r17263  
    404404        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    405405        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
     406        <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    406407        <check key="location:transition" text="Location transition" disable_off="true" />
    407408        <reference ref="ref_operator" />
     
    62146215            <optional>
    62156216                <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
     6217                <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    62166218                <text key="ref" text="Reference" />
    62176219                <text key="operator" text="Operator" />
     
    62296231            <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
    62306232            <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
     6233            <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    62316234        </item> <!-- Power Portal -->
    62326235        <item name="Power Tower" icon="presets/power/tower.svg" type="node" preset_name_label="true">
     
    62406243            <reference ref="ref_operator" />
    62416244            <optional>
    6242                 <combo key="tower:type" text="Tower type" values="termination,branch,transposing,crossing,transition" text_context="power" values_context="power" />
    6243                 <combo key="branch:type" text="Branch tower type" values="tap,split,loop,cross" values_context="power" />
    62446245                <combo key="design" text="Tower design" values="one-level,two-level,donau,three-level,barrel,asymmetric,triangle,flag,donau;one-level,four-level,six-level,nine-level,delta,delta_two-level,y-frame,x-frame,h-frame,guyed_h-frame,portal,portal_two-level,portal_three-level,guyed_v-frame,bipole,monopolar" values_context="power" />
    62456246                <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
     6247                <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    62466248                <check key="triple_tower" text="Triple tower" />
    62476249                <check key="design:incomplete" text="Incomplete tower" />
     
    62956297            <key key="power" value="insulator" />
    62966298            <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
     6299            <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    62976300            <reference ref="ref_operator" />
    62986301        </item> <!-- Insulator -->
  • trunk/resources/data/validator/deprecated.mapcss

    r17216 r17263  
    18001800}
    18011801
    1802 /* #17984 */
     1802/* #17984, #19383 */
    18031803*[tower:type=anchor],
    18041804*[tower:type=suspension] {
     
    18061806  suggestAlternative: concat("line_attachment=", "{0.value}");
    18071807  fixChangeKey: "tower:type => line_attachment";
     1808  set power_tower_type_warning;
     1809  group: tr("deprecated tagging");
     1810}
     1811*[tower:type=branch][branch:type=split],
     1812*[tower:type=branch][branch:type=loop] {
     1813  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1814  suggestAlternative: "line_management=split";
     1815  fixAdd: "line_management=split";
     1816  fixRemove: "tower:type";
     1817  fixRemove: "branch:type";
     1818  set power_tower_type_warning;
     1819  group: tr("deprecated tagging");
     1820}
     1821*[tower:type=branch][!branch:type],
     1822*[tower:type=branch][branch:type=tap] {
     1823  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1824  suggestAlternative: "line_management=branch";
     1825  fixAdd: "line_management=branch";
     1826  fixRemove: "tower:type";
     1827  fixRemove: "branch:type";
     1828  set power_tower_type_warning;
     1829  group: tr("deprecated tagging");
     1830}
     1831*[tower:type=branch][branch:type=cross] {
     1832  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1833  suggestAlternative: "line_management=cross";
     1834  fixAdd: "line_management=cross";
     1835  fixRemove: "tower:type";
     1836  fixRemove: "branch:type";
     1837  set power_tower_type_warning;
     1838  group: tr("deprecated tagging");
     1839}
     1840*[tower:type=termination] {
     1841  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1842  suggestAlternative: "line_management=termination";
     1843  fixAdd: "line_management=termination";
     1844  fixRemove: "tower:type";
     1845  set power_tower_type_warning;
     1846  group: tr("deprecated tagging");
     1847}
     1848*[tower:type=transposing] {
     1849  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1850  suggestAlternative: "line_management=transpose";
     1851  fixAdd: "line_management=transpose";
     1852  fixRemove: "tower:type";
     1853  set power_tower_type_warning;
     1854  group: tr("deprecated tagging");
     1855}
     1856*[tower:type=crossing] {
     1857  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1858  suggestAlternative: "height=* + design=*";
     1859  set power_tower_type_warning;
     1860  group: tr("deprecated tagging");
     1861}
     1862*[tower:type][power][power=~/^(tower|pole|insulator|portal|terminal)$/]!.power_tower_type_warning {
     1863  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
     1864  suggestAlternative: "design";
     1865  suggestAlternative: "structure";
     1866  suggestAlternative: "line_management";
     1867  suggestAlternative: "line_attachment";
     1868  set generic_power_tower_type_warning;
    18081869  group: tr("deprecated tagging");
    18091870}
     
    18131874  suggestAlternative: concat("line_attachment=", "{0.value}");
    18141875  fixChangeKey: "pole:type => line_attachment";
     1876  set power_pole_type_warning;
     1877  group: tr("deprecated tagging");
     1878}
     1879node[pole:type=branch][branch:type=split],
     1880node[pole:type=branch][branch:type=loop] {
     1881  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1882  suggestAlternative: "line_management=split";
     1883  fixAdd: "line_management=split";
     1884  fixRemove: "pole:type";
     1885  fixRemove: "branch:type";
     1886  set power_pole_type_warning;
     1887  group: tr("deprecated tagging");
     1888}
     1889node[pole:type=branch][!branch:type],
     1890node[pole:type=branch][branch:type=tap] {
     1891  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1892  suggestAlternative: "line_management=branch";
     1893  fixAdd: "line_management=branch";
     1894  fixRemove: "pole:type";
     1895  fixRemove: "branch:type";
     1896  set power_pole_type_warning;
     1897  group: tr("deprecated tagging");
     1898}
     1899node[pole:type=branch][branch:type=cross] {
     1900  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1901  suggestAlternative: "line_management=cross";
     1902  fixAdd: "line_management=cross";
     1903  fixRemove: "pole:type";
     1904  fixRemove: "branch:type";
     1905  set power_pole_type_warning;
     1906  group: tr("deprecated tagging");
     1907}
     1908node[pole:type=termination] {
     1909  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1910  suggestAlternative: "line_management=termination";
     1911  fixAdd: "line_management=termination";
     1912  fixRemove: "pole:type";
     1913  set power_pole_type_warning;
     1914  group: tr("deprecated tagging");
     1915}
     1916*[pole:type][power][power=~/^(tower|pole|insulator|portal|terminal)$/]!.power_pole_type_warning!.generic_power_tower_type_warning {
     1917  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
     1918  suggestAlternative: "line_management";
     1919  suggestAlternative: "line_attachment";
    18151920  group: tr("deprecated tagging");
    18161921}
  • trunk/resources/data/validator/geometry.mapcss

    r17249 r17263  
    9797/* {0} on a way, should be a node */
    9898way[line_attachment],
     99way[line_management],
    99100way[emergency=fire_hydrant],
    100101way[emergency=defibrillator],
  • trunk/resources/data/validator/ignoretags.cfg

    r17262 r17263  
    665665E:recycling:metal
    666666K:shop=dog_grooming
    667 K:tower:type=anchor
    668 K:tower:type=suspension
    669 K:pole:type=anchor
    670 K:pole:type=suspension
    671667K:man_made=pipeline_marker
    672668K:pipeline=marker
     
    706702K:cuisine=bbq
    707703K:cuisine=BBQ
     704E:pole:type
    708705;
    709706; Tags not yet decided (to remove from this section when added or moved up when deprecated)
Note: See TracChangeset for help on using the changeset viewer.