From 84895834f7ff49abcbf1a99b581194d0b149b3af Mon Sep 17 00:00:00 2001 From: Thomas Hervey Date: Thu, 30 Aug 2018 16:42:35 -0600 Subject: [PATCH] updated: punctuation and missing descriptions --- css/80_app.css | 4 +- data/core.yaml | 149 +++++++++++----------- dist/locales/en.json | 148 ++++++++++----------- modules/util/keepRight/errorSchema.json | 6 +- modules/util/keepRight/keepRight_error.js | 6 +- 5 files changed, 156 insertions(+), 157 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index c87e69d25..1d601bf0d 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -2589,7 +2589,7 @@ input.key-trap { } .kr_error_type_100 { - color: #9e8e91; + color: #a80000; } .kr_error_type_110 { @@ -2683,7 +2683,7 @@ input.key-trap { .kr_error_type_296, .kr_error_type_297, .kr_error_type_298 { - color: #9bb2cd; + color: #d1dce7; } .kr_error_type_310, diff --git a/data/core.yaml b/data/core.yaml index 065487d54..1f680ff42 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -956,136 +956,136 @@ en: errors: _30: description: 'non-closed_areas' - tooltip: 'This way is tagged with {var1}={var2} and should be closed-loop' + tooltip: 'This way is tagged with {var1}={var2} and should be closed-loop.' _40: description: 'dead-ended one-ways' - tooltip: 'The first node (id {var1}) of this one-way is not connected to any other way' + tooltip: 'The first node (id {var1}) of this one-way is not connected to any other way.' _41: description: '' - tooltip: 'The last node (id {var1}) of this one-way is not connected to any other way' + tooltip: 'The last node (id {var1}) of this one-way is not connected to any other way.' _42: description: '' - tooltip: 'This node cannot be reached because one-ways only lead away from here' + tooltip: 'This node cannot be reached because one-ways only lead away from here.' _43: description: '' - tooltip: 'You cannot escape from this node because one-ways only lead to here' + tooltip: 'You cannot escape from this node because one-ways only lead to here.' _50: description: 'almost-junctions' - tooltip: 'This node is very close but not connected to way #{var1}' + tooltip: 'This node is very close but not connected to way #{var1}.' _70: description: 'missing tags' - tooltip: 'This {var1} has an empty tag: {var2}' + tooltip: 'This {var1} has an empty tag: {var2}.' _71: description: 'way without tags' - tooltip: 'This way has no tags' + tooltip: 'This way has no tags.' _72: description: 'node without tags' - tooltip: 'This node is not member of any way and doesn''t have any tags' + tooltip: 'This node is not member of any way and doesn''t have any tags.' _90: description: 'motorways without ref' - tooltip: 'This way is tagged as motorway and therefore needs a ref nat_ref or int_ref tag' + tooltip: 'This way is tagged as motorway and therefore needs a ref nat_ref or int_ref tag.' _100: description: 'places of worship without religion' - tooltip: 'This {var1} is tagged as place of worship and therefore needs a religion tag' + tooltip: 'This {var1} is tagged as place of worship and therefore needs a religion tag.' _110: description: 'point of interest without name' - tooltip: 'This node is tagged as {var1} and therefore needs a name tag' + tooltip: 'This node is tagged as {var1} and therefore needs a name tag.' _120: description: 'ways without nodes' - tooltip: 'This way has just one single node' + tooltip: 'This way has just one single node.' _130: description: 'floating islands' - tooltip: 'This way is not connected to the rest of the map' + tooltip: 'This way is not connected to the rest of the map.' _150: description: 'railway crossing without tag' - tooltip: 'This crossing of a highway and a railway needs to be tagged as railway=crossing or railway=level_crossing' + tooltip: 'This crossing of a highway and a railway needs to be tagged as railway=crossing or railway=level_crossing.' _160: description: 'wrongly used railway tag' - tooltip: 'There are ways in different layers coming together in this railway crossing. There are ways tagged as tunnel or bridge coming together in this railway crossing' + tooltip: 'There are ways in different layers coming together in this railway crossing. There are ways tagged as tunnel or bridge coming together in this railway crossing.' _170: description: 'FIXME tagged items' tooltip: '{var1}' _180: description: 'relations without type' - tooltip: 'This relation has no type tag which is mandatory for relations' + tooltip: 'This relation has no type tag which is mandatory for relations.' _190: description: 'intersections without junctions' - tooltip: 'Finds way crossings on same layer without common node as a junction' + tooltip: 'Finds way crossings on same layer without common node as a junction.' _191: description: 'highway-highway' - tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node' + tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node.' _192: description: 'highway-waterway' - tooltip: 'This {var1} intersects the {var2} #{var3}' + tooltip: 'This {var1} intersects the {var2} #{var3}.' _193: description: 'highway-riverbank' - tooltip: 'This {var1} intersects the {var2} #{var3}' + tooltip: 'This {var1} intersects the {var2} #{var3}.' _194: description: 'waterway-waterway' - tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node' + tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node.' _195: description: 'cycleway-cycleway' - tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node' + tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node.' _196: description: 'highway-cycleway' - tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node' + tooltip: 'This {var1} intersects the {var2} #{var3} but there is no junction node.' _197: description: 'cycleway-waterway' - tooltip: 'This {var1} intersects the {var2} #{var3}' + tooltip: 'This {var1} intersects the {var2} #{var3}.' _198: description: 'cycleway-riverbank' - tooltip: 'This {var1} intersects the {var2} #{var3}' + tooltip: 'This {var1} intersects the {var2} #{var3}.' _200: description: 'overlapping ways' - tooltip: 'Finds overlapping ways on same layer' + tooltip: 'Finds overlapping ways on same layer.' _201: description: 'highway-highway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _202: description: 'highway-waterway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _203: description: 'highway-riverbank' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _204: description: 'waterway-waterway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _205: description: 'cycleway-cycleway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _206: description: 'highway-cycleway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _207: description: 'cycleway-waterway' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _208: description: 'cycleway-riverbank' - tooltip: 'This {var1} overlaps the {var2} #{var3}' + tooltip: 'This {var1} overlaps the {var2} #{var3}.' _210: description: 'loopings' - tooltip: 'These errors contain self intersecting ways' + tooltip: 'These errors contain self intersecting ways.' _211: description: '' - tooltip: 'This way contains more than one node at least twice. Nodes are {var1}. This may or may not be an error' + tooltip: 'This way contains more than one node at least twice. Nodes are {var1}. This may or may not be an error.' _212: description: '' - tooltip: 'This way has only two different nodes and contains one of them more than once' + tooltip: 'This way has only two different nodes and contains one of them more than once.' _220: description: 'misspelled tags' - tooltip: 'This {var1} is tagged {var2}={var3} where {var4} looks like {var5}' + tooltip: 'This {var1} is tagged {var2}={var3} where {var4} looks like {var5}.' _221: description: '' - tooltip: 'The key of this {var1} tag is key {var2}' + tooltip: 'The key of this {var1} tag is key {var2}.' _230: description: 'layer conflicts' tooltip: '' _231: description: 'mixed layers intersection' - tooltip: 'This node is a junction of ways on different layers: {var1}' + tooltip: 'This node is a junction of ways on different layers: {var1}.' _232: description: 'strange layers' - tooltip: 'This {var1} is tagged with layer {var2}. This need not be an error but it looks strange' + tooltip: 'This {var1} is tagged with layer {var2}. This need not be an error but it looks strange.' _270: description: 'motorways connected directly' tooltip: 'This node is a junction of a motorway and a highway other than motorway, motorway_link, trunk, rest_area or construction. Service or unclassified is only valid if it has access=no/private or it leads to a motorway service area or if it is a service=parking_aisle.' @@ -1094,108 +1094,107 @@ en: tooltip: '' _281: description: 'missing name' - tooltip: 'This boundary has no name' + tooltip: 'This boundary has no name.' _282: description: 'missing admin level' - tooltip: 'The boundary of {var1} has no valid numeric admin_level. Please do not use admin levels like for example 6;7. Always tag the lowest admin_level of all boundaries' + tooltip: 'The boundary of {var1} has no valid numeric admin_level. Please do not use admin levels like for example 6;7. Always tag the lowest admin_level of all boundaries.' _283: description: 'no closed loop' - tooltip: 'The boundary of {var1} is not closed-loop' + tooltip: 'The boundary of {var1} is not closed-loop.' _284: description: 'splitting boundary' - tooltip: 'The boundary of {var1} splits here' + tooltip: 'The boundary of {var1} splits here.' _285: description: 'admin_level too high' - tooltip: 'This boundary-way has admin_level {var1} but belongs to a relation with lower admin_level (higher priority); it should have the lowest admin_level of all relations' + tooltip: 'This boundary-way has admin_level {var1} but belongs to a relation with lower admin_level (higher priority); it should have the lowest admin_level of all relations.' _290: description: 'restrictions' - tooltip: 'Analyses all relations tagged type=restriction or following variations type=restriction:hgv type=restriction:caravan type=restriction:motorcar type=restriction:bus type=restriction:agricultural type=restriction:motorcycle type=restriction:bicycle and type=restriction:hazmat' + tooltip: 'Analyses all relations tagged type=restriction or following variations type=restriction:hgv type=restriction:caravan type=restriction:motorcar type=restriction:bus type=restriction:agricultural type=restriction:motorcycle type=restriction:bicycle and type=restriction:hazmat.' _291: description: 'missing type' - tooltip: 'This turn-restriction has no known restriction type' + tooltip: 'This turn-restriction has no known restriction type.' _292: description: 'missing from way' - tooltip: 'A turn-restriction needs exactly one {var1} member. This one has {var2}' + tooltip: 'A turn-restriction needs exactly one {var1} member. This one has {var2}.' _293: description: 'missing to way' - tooltip: 'A turn-restriction needs exactly one {var1} member. This one has {var2}' + tooltip: 'A turn-restriction needs exactly one {var1} member. This one has {var2}.' _294: description: 'from or to not a way' - tooltip: 'From- and To-members of turn restrictions need to be ways. {var1}' + tooltip: 'From- and To-members of turn restrictions need to be ways. {var1}.' _295: description: 'via is not on the way ends' - tooltip: 'via (node #{var1}) is not the first or the last member of from (way #{var2})' + tooltip: 'via (node #{var1}) is not the first or the last member of from (way #{var2}).' _296: description: 'wrong restriction angle' - tooltip: 'restriction type is {var1} but angle is {var2} degrees. Maybe the restriction type is not appropriate?' + tooltip: 'restriction type is {var1} but angle is {var2} degrees. Maybe the restriction type is not appropriate?.' _297: description: 'wrong direction of to member' - tooltip: 'wrong direction of to way {var1}' + tooltip: 'wrong direction of to way {var1}.' _298: description: 'already restricted by oneway' - tooltip: 'entry already prohibited by oneway tag on {var1}' + tooltip: 'entry already prohibited by oneway tag on {var1}.' _310: description: 'roundabouts' - tooltip: 'Analyses ways with tag junction=roundabout. More then one way can form a roundabout. It supports tag oneway=-1' + tooltip: 'Analyses ways with tag junction=roundabout. More then one way can form a roundabout. It supports tag oneway=-1.' _311: description: 'not closed loop' - tooltip: 'This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout)' + tooltip: 'This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout).' _312: description: 'wrong direction' - tooltip: 'If this roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this roundabout is in a country with left-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with left-hand traffic then its orientation goes the wrong way around' + tooltip: 'If this roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this roundabout is in a country with left-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with left-hand traffic then its orientation goes the wrong way around.' _313: description: 'faintly connected' - tooltip: 'This roundabout has only {var1} other roads connected. Roundabouts typically have three' + tooltip: 'This roundabout has only {var1} other roads connected. Roundabouts typically have three.' _320: description: '*_link connections' - tooltip: 'This way is tagged as highway={var1}_link but doesn''t have a connection to any other {var1} or {var1}_link' + tooltip: 'This way is tagged as highway={var1}_link but doesn''t have a connection to any other {var1} or {var1}_link.' _350: description: 'bridge-tags' - tooltip: 'This bridge doesn''t have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var1}' + tooltip: 'This bridge doesn''t have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var1}.' _370: description: 'doubled places' - tooltip: 'This node has tags in common with the surrounding way #{var1} and seems to be redundand | This node has tags in common with the surrounding way #{var1} (including the name {var2}) and seems to be redundand' + tooltip: 'This node has tags in common with the surrounding way #{var1} and seems to be redundand | This node has tags in common with the surrounding way #{var1} (including the name {var2}) and seems to be redundand.' _380: description: 'non-physical use of sport-tag' - tooltip: 'This way is tagged {var1} but has no physical tag like e.g. leisure, building, amenity or highway' + tooltip: 'This way is tagged {var1} but has no physical tag like e.g. leisure, building, amenity or highway.' _400: description: 'geometry glitches' tooltip: '' _401: description: 'missing turn restriction' - tooltip: 'ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning from way {var1} to {var2}' + tooltip: 'ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning from way {var1} to {var2}.' _402: description: 'impossible angles' - tooltip: 'this way bends in a very sharp angle here' + tooltip: 'this way bends in a very sharp angle here.' _410: description: 'website' - tooltip: 'Web pages are analyzed. Web page is defined by any of the following tags website=* url=* website:mobile=* contact:website=* contact:url=* image=* source:website=* or source:url=*' + tooltip: 'Web pages are analyzed. Web page is defined by any of the following tags website=* url=* website:mobile=* contact:website=* contact:url=* image=* source:website=* or source:url=*.' _411: description: 'http error' - tooltip: 'The URL ({var1}) cannot be opened (HTTP status code {var2})' + tooltip: 'The URL ({var1}) cannot be opened (HTTP status code {var2}).' _412: description: 'domain hijacking' - tooltip: 'Possible domain squatting: {var1}. Suspicious text is: "{var2}"' + tooltip: 'Possible domain squatting: {var1}. Suspicious text is: "{var2}".' _413: description: 'non-match' - tooltip: 'Content of the URL ({var1}) did not contain these keywords: ({var2})' + tooltip: 'Content of the URL ({var1}) did not contain these keywords: ({var2}).' warnings: _20: description: 'multiple nodes on the same spot' - tooltip: 'There is more than one node in this spot. Offending node IDs: {var1}' + tooltip: 'There is more than one node in this spot. Offending node IDs: {var1}.' _60: description: 'depreciated tags' tooltip: 'This {var1} uses deprecated tag {var2}={var3}. Please use {var4} instead!' _300: description: 'missing maxspeed' - tooltip: 'missing maxspeed tag' + tooltip: 'missing maxspeed tag.' _360: description: 'language unknown' - tooltip: 'It would be nice if this {var1} had an additional tag name:XX={var2} where XX shows the language of its name {var2}' + tooltip: 'It would be nice if this {var1} had an additional tag name:XX={var2} where XX shows the language of its name {var2}.' _390: description: 'missing tracktype' - tooltip: This track doesn't have a tracktype ->>>>>>> cleaned map data UI; commented sub-layer filtering + tooltip: This track doesn't have a tracktype. streetside: tooltip: "Streetside photos from Microsoft" title: "Photo Overlay (Bing Streetside)" diff --git a/dist/locales/en.json b/dist/locales/en.json index d8586a2ec..1a861d74b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1164,67 +1164,67 @@ "errors": { "_30": { "description": "non-closed_areas", - "tooltip": "This way is tagged with {var1}={var2} and should be closed-loop" + "tooltip": "This way is tagged with {var1}={var2} and should be closed-loop." }, "_40": { "description": "dead-ended one-ways", - "tooltip": "The first node (id {var1}) of this one-way is not connected to any other way" + "tooltip": "The first node (id {var1}) of this one-way is not connected to any other way." }, "_41": { "description": "", - "tooltip": "The last node (id {var1}) of this one-way is not connected to any other way" + "tooltip": "The last node (id {var1}) of this one-way is not connected to any other way." }, "_42": { "description": "", - "tooltip": "This node cannot be reached because one-ways only lead away from here" + "tooltip": "This node cannot be reached because one-ways only lead away from here." }, "_43": { "description": "", - "tooltip": "You cannot escape from this node because one-ways only lead to here" + "tooltip": "You cannot escape from this node because one-ways only lead to here." }, "_50": { "description": "almost-junctions", - "tooltip": "This node is very close but not connected to way #{var1}" + "tooltip": "This node is very close but not connected to way #{var1}." }, "_70": { "description": "missing tags", - "tooltip": "This {var1} has an empty tag: {var2}" + "tooltip": "This {var1} has an empty tag: {var2}." }, "_71": { "description": "way without tags", - "tooltip": "This way has no tags" + "tooltip": "This way has no tags." }, "_72": { "description": "node without tags", - "tooltip": "This node is not member of any way and doesn't have any tags" + "tooltip": "This node is not member of any way and doesn't have any tags." }, "_90": { "description": "motorways without ref", - "tooltip": "This way is tagged as motorway and therefore needs a ref nat_ref or int_ref tag" + "tooltip": "This way is tagged as motorway and therefore needs a ref nat_ref or int_ref tag." }, "_100": { "description": "places of worship without religion", - "tooltip": "This {var1} is tagged as place of worship and therefore needs a religion tag" + "tooltip": "This {var1} is tagged as place of worship and therefore needs a religion tag." }, "_110": { "description": "point of interest without name", - "tooltip": "This node is tagged as {var1} and therefore needs a name tag" + "tooltip": "This node is tagged as {var1} and therefore needs a name tag." }, "_120": { "description": "ways without nodes", - "tooltip": "This way has just one single node" + "tooltip": "This way has just one single node." }, "_130": { "description": "floating islands", - "tooltip": "This way is not connected to the rest of the map" + "tooltip": "This way is not connected to the rest of the map." }, "_150": { "description": "railway crossing without tag", - "tooltip": "This crossing of a highway and a railway needs to be tagged as railway=crossing or railway=level_crossing" + "tooltip": "This crossing of a highway and a railway needs to be tagged as railway=crossing or railway=level_crossing." }, "_160": { "description": "wrongly used railway tag", - "tooltip": "There are ways in different layers coming together in this railway crossing. There are ways tagged as tunnel or bridge coming together in this railway crossing" + "tooltip": "There are ways in different layers coming together in this railway crossing. There are ways tagged as tunnel or bridge coming together in this railway crossing." }, "_170": { "description": "FIXME tagged items", @@ -1232,99 +1232,99 @@ }, "_180": { "description": "relations without type", - "tooltip": "This relation has no type tag which is mandatory for relations" + "tooltip": "This relation has no type tag which is mandatory for relations." }, "_190": { "description": "intersections without junctions", - "tooltip": "Finds way crossings on same layer without common node as a junction" + "tooltip": "Finds way crossings on same layer without common node as a junction." }, "_191": { "description": "highway-highway", - "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node" + "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node." }, "_192": { "description": "highway-waterway", - "tooltip": "This {var1} intersects the {var2} #{var3}" + "tooltip": "This {var1} intersects the {var2} #{var3}." }, "_193": { "description": "highway-riverbank", - "tooltip": "This {var1} intersects the {var2} #{var3}" + "tooltip": "This {var1} intersects the {var2} #{var3}." }, "_194": { "description": "waterway-waterway", - "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node" + "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node." }, "_195": { "description": "cycleway-cycleway", - "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node" + "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node." }, "_196": { "description": "highway-cycleway", - "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node" + "tooltip": "This {var1} intersects the {var2} #{var3} but there is no junction node." }, "_197": { "description": "cycleway-waterway", - "tooltip": "This {var1} intersects the {var2} #{var3}" + "tooltip": "This {var1} intersects the {var2} #{var3}." }, "_198": { "description": "cycleway-riverbank", - "tooltip": "This {var1} intersects the {var2} #{var3}" + "tooltip": "This {var1} intersects the {var2} #{var3}." }, "_200": { "description": "overlapping ways", - "tooltip": "Finds overlapping ways on same layer" + "tooltip": "Finds overlapping ways on same layer." }, "_201": { "description": "highway-highway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_202": { "description": "highway-waterway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_203": { "description": "highway-riverbank", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_204": { "description": "waterway-waterway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_205": { "description": "cycleway-cycleway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_206": { "description": "highway-cycleway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_207": { "description": "cycleway-waterway", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_208": { "description": "cycleway-riverbank", - "tooltip": "This {var1} overlaps the {var2} #{var3}" + "tooltip": "This {var1} overlaps the {var2} #{var3}." }, "_210": { "description": "loopings", - "tooltip": "These errors contain self intersecting ways" + "tooltip": "These errors contain self intersecting ways." }, "_211": { "description": "", - "tooltip": "This way contains more than one node at least twice. Nodes are {var1}. This may or may not be an error" + "tooltip": "This way contains more than one node at least twice. Nodes are {var1}. This may or may not be an error." }, "_212": { "description": "", - "tooltip": "This way has only two different nodes and contains one of them more than once" + "tooltip": "This way has only two different nodes and contains one of them more than once." }, "_220": { "description": "misspelled tags", - "tooltip": "This {var1} is tagged {var2}={var3} where {var4} looks like {var5}" + "tooltip": "This {var1} is tagged {var2}={var3} where {var4} looks like {var5}." }, "_221": { "description": "", - "tooltip": "The key of this {var1} tag is key {var2}" + "tooltip": "The key of this {var1} tag is key {var2}." }, "_230": { "description": "layer conflicts", @@ -1332,11 +1332,11 @@ }, "_231": { "description": "mixed layers intersection", - "tooltip": "This node is a junction of ways on different layers: {var1}" + "tooltip": "This node is a junction of ways on different layers: {var1}." }, "_232": { "description": "strange layers", - "tooltip": "This {var1} is tagged with layer {var2}. This need not be an error but it looks strange" + "tooltip": "This {var1} is tagged with layer {var2}. This need not be an error but it looks strange." }, "_270": { "description": "motorways connected directly", @@ -1348,91 +1348,91 @@ }, "_281": { "description": "missing name", - "tooltip": "This boundary has no name" + "tooltip": "This boundary has no name." }, "_282": { "description": "missing admin level", - "tooltip": "The boundary of {var1} has no valid numeric admin_level. Please do not use admin levels like for example 6;7. Always tag the lowest admin_level of all boundaries" + "tooltip": "The boundary of {var1} has no valid numeric admin_level. Please do not use admin levels like for example 6;7. Always tag the lowest admin_level of all boundaries." }, "_283": { "description": "no closed loop", - "tooltip": "The boundary of {var1} is not closed-loop" + "tooltip": "The boundary of {var1} is not closed-loop." }, "_284": { "description": "splitting boundary", - "tooltip": "The boundary of {var1} splits here" + "tooltip": "The boundary of {var1} splits here." }, "_285": { "description": "admin_level too high", - "tooltip": "This boundary-way has admin_level {var1} but belongs to a relation with lower admin_level (higher priority); it should have the lowest admin_level of all relations" + "tooltip": "This boundary-way has admin_level {var1} but belongs to a relation with lower admin_level (higher priority); it should have the lowest admin_level of all relations." }, "_290": { "description": "restrictions", - "tooltip": "Analyses all relations tagged type=restriction or following variations type=restriction:hgv type=restriction:caravan type=restriction:motorcar type=restriction:bus type=restriction:agricultural type=restriction:motorcycle type=restriction:bicycle and type=restriction:hazmat" + "tooltip": "Analyses all relations tagged type=restriction or following variations type=restriction:hgv type=restriction:caravan type=restriction:motorcar type=restriction:bus type=restriction:agricultural type=restriction:motorcycle type=restriction:bicycle and type=restriction:hazmat." }, "_291": { "description": "missing type", - "tooltip": "This turn-restriction has no known restriction type" + "tooltip": "This turn-restriction has no known restriction type." }, "_292": { "description": "missing from way", - "tooltip": "A turn-restriction needs exactly one {var1} member. This one has {var2}" + "tooltip": "A turn-restriction needs exactly one {var1} member. This one has {var2}." }, "_293": { "description": "missing to way", - "tooltip": "A turn-restriction needs exactly one {var1} member. This one has {var2}" + "tooltip": "A turn-restriction needs exactly one {var1} member. This one has {var2}." }, "_294": { "description": "from or to not a way", - "tooltip": "From- and To-members of turn restrictions need to be ways. {var1}" + "tooltip": "From- and To-members of turn restrictions need to be ways. {var1}." }, "_295": { "description": "via is not on the way ends", - "tooltip": "via (node #{var1}) is not the first or the last member of from (way #{var2})" + "tooltip": "via (node #{var1}) is not the first or the last member of from (way #{var2})." }, "_296": { "description": "wrong restriction angle", - "tooltip": "restriction type is {var1} but angle is {var2} degrees. Maybe the restriction type is not appropriate?" + "tooltip": "restriction type is {var1} but angle is {var2} degrees. Maybe the restriction type is not appropriate?." }, "_297": { "description": "wrong direction of to member", - "tooltip": "wrong direction of to way {var1}" + "tooltip": "wrong direction of to way {var1}." }, "_298": { "description": "already restricted by oneway", - "tooltip": "entry already prohibited by oneway tag on {var1}" + "tooltip": "entry already prohibited by oneway tag on {var1}." }, "_310": { "description": "roundabouts", - "tooltip": "Analyses ways with tag junction=roundabout. More then one way can form a roundabout. It supports tag oneway=-1" + "tooltip": "Analyses ways with tag junction=roundabout. More then one way can form a roundabout. It supports tag oneway=-1." }, "_311": { "description": "not closed loop", - "tooltip": "This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout)" + "tooltip": "This way is part of a roundabout but is not closed-loop. (split carriageways approaching a roundabout should not be tagged as roundabout)." }, "_312": { "description": "wrong direction", - "tooltip": "If this roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this roundabout is in a country with left-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with left-hand traffic then its orientation goes the wrong way around" + "tooltip": "If this roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this roundabout is in a country with left-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with right-hand traffic then its orientation goes the wrong way around | If this mini_roundabout is in a country with left-hand traffic then its orientation goes the wrong way around." }, "_313": { "description": "faintly connected", - "tooltip": "This roundabout has only {var1} other roads connected. Roundabouts typically have three" + "tooltip": "This roundabout has only {var1} other roads connected. Roundabouts typically have three." }, "_320": { "description": "*_link connections", - "tooltip": "This way is tagged as highway={var1}_link but doesn't have a connection to any other {var1} or {var1}_link" + "tooltip": "This way is tagged as highway={var1}_link but doesn't have a connection to any other {var1} or {var1}_link." }, "_350": { "description": "bridge-tags", - "tooltip": "This bridge doesn't have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var1}" + "tooltip": "This bridge doesn't have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var1}." }, "_370": { "description": "doubled places", - "tooltip": "This node has tags in common with the surrounding way #{var1} and seems to be redundand | This node has tags in common with the surrounding way #{var1} (including the name {var2}) and seems to be redundand" + "tooltip": "This node has tags in common with the surrounding way #{var1} and seems to be redundand | This node has tags in common with the surrounding way #{var1} (including the name {var2}) and seems to be redundand." }, "_380": { "description": "non-physical use of sport-tag", - "tooltip": "This way is tagged {var1} but has no physical tag like e.g. leisure, building, amenity or highway" + "tooltip": "This way is tagged {var1} but has no physical tag like e.g. leisure, building, amenity or highway." }, "_400": { "description": "geometry glitches", @@ -1440,33 +1440,33 @@ }, "_401": { "description": "missing turn restriction", - "tooltip": "ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning from way {var1} to {var2}" + "tooltip": "ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning from way {var1} to {var2}." }, "_402": { "description": "impossible angles", - "tooltip": "this way bends in a very sharp angle here" + "tooltip": "this way bends in a very sharp angle here." }, "_410": { "description": "website", - "tooltip": "Web pages are analyzed. Web page is defined by any of the following tags website=* url=* website:mobile=* contact:website=* contact:url=* image=* source:website=* or source:url=*" + "tooltip": "Web pages are analyzed. Web page is defined by any of the following tags website=* url=* website:mobile=* contact:website=* contact:url=* image=* source:website=* or source:url=*." }, "_411": { "description": "http error", - "tooltip": "The URL ({var1}) cannot be opened (HTTP status code {var2})" + "tooltip": "The URL ({var1}) cannot be opened (HTTP status code {var2})." }, "_412": { "description": "domain hijacking", - "tooltip": "Possible domain squatting: {var1}. Suspicious text is: \"{var2}\"" + "tooltip": "Possible domain squatting: {var1}. Suspicious text is: \"{var2}\"." }, "_413": { "description": "non-match", - "tooltip": "Content of the URL ({var1}) did not contain these keywords: ({var2})" + "tooltip": "Content of the URL ({var1}) did not contain these keywords: ({var2})." } }, "warnings": { "_20": { "description": "multiple nodes on the same spot", - "tooltip": "There is more than one node in this spot. Offending node IDs: {var1}" + "tooltip": "There is more than one node in this spot. Offending node IDs: {var1}." }, "_60": { "description": "depreciated tags", @@ -1474,15 +1474,15 @@ }, "_300": { "description": "missing maxspeed", - "tooltip": "missing maxspeed tag" + "tooltip": "missing maxspeed tag." }, "_360": { "description": "language unknown", - "tooltip": "It would be nice if this {var1} had an additional tag name:XX={var2} where XX shows the language of its name {var2}" + "tooltip": "It would be nice if this {var1} had an additional tag name:XX={var2} where XX shows the language of its name {var2}." }, "_390": { "description": "missing tracktype", - "tooltip": "This track doesn't have a tracktype" + "tooltip": "This track doesn't have a tracktype." } } } diff --git a/modules/util/keepRight/errorSchema.json b/modules/util/keepRight/errorSchema.json index c6688d9d2..3bfd75b72 100644 --- a/modules/util/keepRight/errorSchema.json +++ b/modules/util/keepRight/errorSchema.json @@ -168,7 +168,7 @@ }, "_230": { "title": "layer conflicts", - "description": "" + "description": "Connected ways should be on the same layer. Crossings on intermediate nodes of ways on different layers are obviously wrong. Junctions on end-nodes of ways on different layers are also deprecated, but common practice. So you may ignore this part of the check and switch them off separately. Please note that bridges are set to layer +1, and tunnels to -1, anything else to layer 0 implicitly if no layer tag is present." }, "_231": { "title": "mixed layers intersection", @@ -184,7 +184,7 @@ }, "_280": { "title": "boundaries", - "description": "" + "description": "Administrative Boundaries can be expressed either by tagging ways or by adding them to a relation. They should be closed-loop sequences of ways, they must not self-intersect or split and they must have a name and an admin_level." }, "_281": { "title": "missing name", @@ -276,7 +276,7 @@ }, "_400": { "title": "geometry glitches", - "description": "" + "description": "Impossible sharp angles on highways and junctions. These may be caused by missing turn restrictions on junctions or glitches along the linestring of ways" }, "_401": { "title": "missing turn restriction", diff --git a/modules/util/keepRight/keepRight_error.js b/modules/util/keepRight/keepRight_error.js index 8a9908384..8986b3bd5 100644 --- a/modules/util/keepRight/keepRight_error.js +++ b/modules/util/keepRight/keepRight_error.js @@ -65,6 +65,7 @@ export function parseErrorDescriptions(entity) { var parsedDescriptions = []; var variable_re = new RegExp(/{\$[0-9]}/); var html_re = new RegExp(/<\/[a-z][\s\S]*>/); + var span_re = new RegExp(/<\/span>/); var commonEntities = ['node', 'way', 'relation', 'highway', 'cycleway', 'waterway', 'riverbank']; // TODO: expand this list, or implement a different translation function @@ -123,8 +124,8 @@ export function parseErrorDescriptions(entity) { // add phrase (or single word) to variable list parsedPhrase += currWord; } - // if any variables have html, escape them - if (html_re.test(parsedPhrase)) { + // if any variables have html (excluding spans which are added ^), escape them + if (html_re.test(parsedPhrase) && !span_re.test(parsedPhrase)) { parsedPhrase = '\\' + parsedPhrase + '\\'; } parsedDescriptions.push(parsedPhrase); @@ -132,7 +133,6 @@ export function parseErrorDescriptions(entity) { } }); - return { var1: parsedDescriptions[0] || '', var2: parsedDescriptions[1] || '',