Changeset 13006 in josm


Ignore:
Timestamp:
2017-10-16T21:23:59+02:00 (5 weeks ago)
Author:
Klumbumbus
Message:
  • fix #15032 - don't warn about tourism nodes on way end nodes
  • see #15401 - adblue is not a fuel, restores sorted fuel list too
Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r12998 r13006  
    31053105                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
    31063106                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
    3107                     <check key="fuel:adblue" text="Diesel Exhaust Fluid (AdBlue/AUS32)" />
    31083107                    <check key="fuel:octane_80" text="Octane 80" />
    31093108                    <check key="fuel:octane_91" text="Octane 91" />
     
    31193118                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
    31203119                </checkgroup>
     3120                <space />
     3121                <label text="Additives:" />
     3122                <check key="fuel:adblue" text="Diesel Exhaust Fluid (AdBlue/AUS32)" />
    31213123                <space />
    31223124                <label text="Fuel cards:" />
  • trunk/data/validator/geometry.mapcss

    r12775 r13006  
    111111way[route=bus] {
    112112  throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}");
     113}
     114
     115/* #14395 */
     116way >[index=1] node,
     117way >[index=-1] node {
     118  set first_last_node;
     119}
     120way[highway][area!=yes][!tunnel][!covered] > node {
     121  set node_in_highway;
     122}
     123way[building][building!=no] > node.node_in_highway!.first_last_node {
     124  throwWarning: tr("node connects highway and building");
     125}
     126
     127/* #15035, must not warn for node 3815077900*/
     128node[man_made!=monitoring_station][at(0.0,0.0)] {
     129  throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
     130  fixDeleteObject: this;
    113131}
    114132
     
    247265}
    248266
    249 /* #11128, #14812 */
     267/* #11128, #14812, #15032 */
    250268way[highway] > node[tourism=information][information=guidepost] {
    251269  set guidepost;
     
    257275way[highway] > node[office][!entrance],
    258276way[highway] > node[shop][!entrance],
    259 way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost {
     277way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost.first_last_node:connection,
     278way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost!.first_last_node {
    260279  throwWarning: tr("{0} node connected to a highway", "{0.key}");
    261280}
     
    321340}
    322341
    323 /* #14395 */
    324 way >[index=1] node,
    325 way >[index=-1] node {
    326   set first_last_node;
    327 }
    328 way[highway][area!=yes][!tunnel][!covered] > node {
    329   set node_in_highway;
    330 }
    331 way[building][building!=no] > node.node_in_highway!.first_last_node {
    332   throwWarning: tr("node connects highway and building");
    333 }
    334 
    335 /* #15035, must not warn for node 3815077900*/
    336 node[man_made!=monitoring_station][at(0.0,0.0)] {
    337   throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
    338   fixDeleteObject: this;
    339 }
    340 
    341342/* #15097 */
    342343way[highway][area!=yes] > node,
Note: See TracChangeset for help on using the changeset viewer.