From aa4d54c3295826c90525cb63447b044293cf04a6 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 20 Mar 2013 10:57:54 -0400 Subject: [PATCH 01/10] stop adding extra line break when building locales.js fixes #1090 --- build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.js b/build.js index e05dd40e2..eae01db09 100644 --- a/build.js +++ b/build.js @@ -92,5 +92,5 @@ fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({ var core = YAML.load(fs.readFileSync('data/core.yaml', 'utf8')); var presets = YAML.load(fs.readFileSync('data/presets.yaml', 'utf8')); var en = _.merge(core, presets); -var out = 'locale.en = ' + JSON.stringify(en.en, null, 4) + ';\n'; +var out = 'locale.en = ' + JSON.stringify(en.en, null, 4) + ';'; fs.writeFileSync('data/locales.js', fs.readFileSync('data/locales.js', 'utf8').replace(/locale.en =[^;]*;/, out)); From 110427a1864ec5fa08232ce3b1410c3d456f96b7 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 20 Mar 2013 11:15:48 -0400 Subject: [PATCH 02/10] Re-add area as a geometry for tagless other preset Without it, areas without area=yes don't match any preset fix #1087 --- js/id/presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/id/presets.js b/js/id/presets.js index 152a080f9..0f43ddf31 100644 --- a/js/id/presets.js +++ b/js/id/presets.js @@ -5,7 +5,7 @@ iD.presets = function(context) { var other = iD.presets.Preset('other', { tags: {}, - geometry: ['point', 'vertex', 'line'] + geometry: ['point', 'vertex', 'line', 'area'] }), otherarea = iD.presets.Preset('other/area', { tags: { area: 'yes' }, From e988ffea14414abcc0e3dcb6b0318bf1daadf43c Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 20 Mar 2013 11:30:48 -0400 Subject: [PATCH 03/10] adding delete back into tag editor, closes #1088 --- css/app.css | 7 +++++++ js/id/ui/taglist.js | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/css/app.css b/css/app.css index 50b48896c..779700a31 100644 --- a/css/app.css +++ b/css/app.css @@ -1199,6 +1199,10 @@ div.combobox { border-radius: 0; } +.tag-row button.tag-help { + left: -20px +} + .tag-row:hover input.value { border-radius: 0; } @@ -1207,6 +1211,9 @@ div.combobox { opacity: 1; } +/* Adding form fields to tag editor */ + + .inspector-inner .add-tag { height: 30px; border-top: 0; diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js index 408ecbbe3..81042d679 100644 --- a/js/id/ui/taglist.js +++ b/js/id/ui/taglist.js @@ -86,6 +86,14 @@ iD.ui.Taglist = function(context, entity) { row.each(bindTypeahead); + var removeBtn = row.append('button') + .attr('tabindex', -1) + .attr('class','remove minor') + .on('click', removeTag); + + removeBtn.append('span') + .attr('class', 'icon delete'); + function findLocal(docs) { var locale = iD.detect().locale.toLowerCase(), localized; From febe8dc224371cedaf7241785e19afdb38fc6948 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 20 Mar 2013 12:49:02 -0400 Subject: [PATCH 04/10] hide preset descriptions when updating grid --- js/id/ui/preset_grid.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js index 8d1f75f8a..03d501813 100644 --- a/js/id/ui/preset_grid.js +++ b/js/id/ui/preset_grid.js @@ -233,6 +233,8 @@ iD.ui.PresetGrid = function(context, entity) { show_more .style('display', (selection.data()[0].length > limit) ? 'block' : 'none'); + selection.selectAll('.preset-inspect').remove(); + var entries = selection .selectAll('div.grid-entry-wrap') .data(function(d) { return d.slice(0, limit); }, name); From 279ff5fba07e85b47d5041d5c65a0d25e3e67b91 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 20 Mar 2013 13:12:40 -0400 Subject: [PATCH 05/10] adding more line presets. --- img/source/line-presets.svg | 2206 +++++++++++++++++++++++++++++++++-- 1 file changed, 2112 insertions(+), 94 deletions(-) diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg index 20ddcafec..fb0f8e938 100644 --- a/img/source/line-presets.svg +++ b/img/source/line-presets.svg @@ -18,6 +18,42 @@ sodipodi:docname="line-presets.svg"> + + + + + + + + + + + + @@ -62,22 +98,22 @@ y2="126.40627" /> @@ -119,8 +155,8 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="862.66013" - inkscape:cy="-98.288721" + inkscape:cx="1863.3013" + inkscape:cy="42.278353" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -198,6 +234,14 @@ orientation="-0.35112353,0.93632914" position="22.917454,41.594048" id="guide24387" /> + + @@ -216,13 +260,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(400,-12.362183)"> - + style="color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> + style="opacity:0.50000000000000000;color:#000000;fill:url(#linearGradient7078);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + id="g24211" + style="fill:#989898;fill-opacity:1"> + id="g24213" + style="fill:#989898;fill-opacity:1"> @@ -375,7 +404,7 @@ transform="translate(3,1)" id="g24201" /> + transform="translate(3,1)" + style="fill:#989898;fill-opacity:1"> + transform="translate(0,-1)" + style="fill:#989898;fill-opacity:1"> @@ -495,14 +526,14 @@ height="3.0000014" width="40" id="rect24309" - style="color:#000000;fill:#58a9ed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> + style="opacity:0.50000000000000000;color:#000000;fill:url(#linearGradient7337);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -647,7 +678,7 @@ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="arc" /> + y="78.362183" /> @@ -1464,7 +1495,7 @@ transform="translate(330,0)" id="g26934"> @@ -1533,7 +1564,7 @@ sodipodi:type="arc" /> @@ -1562,7 +1593,7 @@ id="rect7141" style="color:#000000;fill:none;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + style="color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6b7a0ec0589e2b6a476bfcd864abbb468cd295e1 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 20 Mar 2013 13:38:12 -0400 Subject: [PATCH 06/10] more line icons. --- img/source/line-presets.svg | 119 +++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 2 deletions(-) diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg index fb0f8e938..8130ea4bd 100644 --- a/img/source/line-presets.svg +++ b/img/source/line-presets.svg @@ -155,8 +155,8 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="1863.3013" - inkscape:cy="42.278353" + inkscape:cx="2161.0019" + inkscape:cy="-123.70735" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -242,6 +242,10 @@ orientation="0.97247551,0.23300513" position="2150.321,40.747144" id="guide5075" /> + @@ -3847,5 +3851,116 @@ RK5CYII= id="rect5105" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + + + + From 440706145db0d78fcf4e1527102d97b21ddbaf3d Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 20 Mar 2013 15:21:01 -0400 Subject: [PATCH 07/10] adding more line presets, resizing them. --- css/app.css | 3 +- img/source/line-presets.svg | 1241 ++++++++++++++++++++++++++++------- 2 files changed, 1010 insertions(+), 234 deletions(-) diff --git a/css/app.css b/css/app.css index 779700a31..c24c39e1a 100644 --- a/css/app.css +++ b/css/app.css @@ -1203,7 +1203,8 @@ div.combobox { left: -20px } -.tag-row:hover input.value { +.tag-row:hover input.value, +.tag-row:hover input.key { border-radius: 0; } diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg index 8130ea4bd..677f502e7 100644 --- a/img/source/line-presets.svg +++ b/img/source/line-presets.svg @@ -19,40 +19,16 @@ + style="stop-color:#444444;stop-opacity:1;" /> - - - - - - - - + style="stop-color:#b5b5b5;stop-opacity:1" /> - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -246,6 +339,10 @@ orientation="-0.81923947,0.57345156" position="2260.1726,65.38939" id="guide5247" /> + @@ -284,14 +381,15 @@ id="g23490" /> + inkscape:label="#g7086" + transform="translate(-250,0)"> + width="50" + height="50" + x="175" + y="37.362183" /> - - + inkscape:label="#g26365" + transform="translate(-300,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path24215" + inkscape:connector-curvature="0" /> + inkscape:label="#g7302" + transform="translate(-350,0)"> + width="50" + height="50" + x="395" + y="37.362183" /> + inkscape:label="#g7349" + transform="translate(-450,0)"> + width="50" + height="50" + x="615" + y="37.362183" /> - + transform="translate(-390,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + inkscape:label="#g26461" + transform="translate(-550,0)"> + width="50" + height="50" + x="835" + y="37.362183" /> + inkscape:label="#g26475" + transform="translate(-600,0)"> + width="50" + height="50" + x="945" + y="37.362183" /> + inkscape:label="#g7315" + transform="translate(-400,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -1267,14 +1354,15 @@ transform="matrix(-1,0,0,1,-260,0)" /> + inkscape:label="#g5483" + transform="translate(-50,0)"> + width="50" + height="50" + x="-265" + y="37.362183" /> @@ -1369,14 +1457,15 @@ id="g26858" /> + inkscape:label="#g5500" + transform="translate(-100,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -1419,9 +1508,10 @@ transform="translate(220,0)"> + id="path26765" + inkscape:connector-curvature="0" /> + + inkscape:label="#g5517" + transform="translate(-150,0)"> + width="50" + height="50" + x="-45" + y="37.362183" /> @@ -1500,9 +1598,10 @@ id="g26934"> + id="path26936" + inkscape:connector-curvature="0" /> + inkscape:label="#g5530" + transform="translate(-200,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -1569,9 +1669,10 @@ + id="path27005" + inkscape:connector-curvature="0" /> + transform="translate(230,0)"> + style="color:#000000;fill:none;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="translate(-370,0)"> + id="highway-path" + transform="translate(-90,0)"> + width="50" + height="50" + x="615" + y="37.362183" /> @@ -1857,14 +1958,14 @@ + transform="translate(300,0)"> + width="50" + height="50" + x="285" + y="37.362183" /> @@ -1950,12 +2051,13 @@ + transform="translate(-830,0)"> + id="path3888" + inkscape:connector-curvature="0" /> + width="50" + height="50" + x="285" + y="37.362183" /> @@ -2075,11 +2177,11 @@ sodipodi:cy="66.5" sodipodi:rx="1.5" sodipodi:ry="1.5" - d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" + d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z" transform="matrix(1.6666667,0,0,1.6666667,1468.6667,-31.97115)" /> + transform="translate(-770,0)"> + id="g5157" + transform="translate(-950,0)"> + width="50" + height="50" + x="835" + y="37.362183" /> + d="m 2135,32 -6,6 0,15 2,2 18,0 2,-2 0,-15 -6,-6 z" + style="color:#000000;fill:#989898;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> + d="m 2133,27 c -5,0 -9,3 -9,9 l 0,20 3,-1 0,-19 c 0,-4 3,-6 6,-6 l 6,0 2,0 6,0 c 3,0 6,2 6,6 l 0,19 3,1 0,-20 c 0,-6 -4.068,-8.178005 -9,-9 l -6,0 -2,0 z" + style="color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssccssccssccssccs" /> + inkscape:label="#g5324" + transform="translate(-1000,0)"> @@ -3962,5 +4070,672 @@ RK5CYII= sodipodi:nodetypes="ccccccccc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 64ad80c5c62be12b175fbb6f9e9b60cce686b4df Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 20 Mar 2013 15:29:30 -0400 Subject: [PATCH 08/10] move preset icon and type name into header --- css/app.css | 10 ++++++++++ data/core.yaml | 2 +- js/id/ui/tag_editor.js | 23 +++++++---------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/css/app.css b/css/app.css index c24c39e1a..5c4f77470 100644 --- a/css/app.css +++ b/css/app.css @@ -649,11 +649,21 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} position: relative; } +.inspector-wrap .message div.fl, .inspector-wrap .message button.fl { height: 100%; border-radius: 0; border-right: 1px solid #CCC; width: 12.5%; + text-align: center; +} + +.inspector-wrap .message div.fl .icon{ + margin-top: 18px; +} +.inspector-wrap .message div.fl.line .icon{ + margin-left: -25px; + margin-top: -23px; } .inspector-wrap .message button.fr { diff --git a/data/core.yaml b/data/core.yaml index c8f94ba1b..1a0e77793 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -139,7 +139,7 @@ en: okay: Okay view_on_osm: View on OSM name: Name - editing: Edit details + editing_feature: "Editing {feature}" additional: Additional tags choose: Select feature type results: "{n} results for {search}" diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index 847d99bc2..bfbda692c 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -37,9 +37,14 @@ iD.ui.TagEditor = function(context, entity) { .append('span') .attr('class', 'icon back'); + messagewrap.append('div') + .attr('class', 'preset-reset fl ' + geometry) + .append('span') + .attr('class', 'icon' + (preset ? ' feature-' + (preset.icon || 'marker-stroked') : '')); + messagewrap.append('h3') .attr('class', 'inspector-inner fl') - .text(t('inspector.editing')); + .text('Editing ' + preset.name()); messagewrap.append('button') .attr('class', 'preset-close fr') @@ -52,22 +57,8 @@ iD.ui.TagEditor = function(context, entity) { var headerwrap = editorwrap.append('div').attr('class','col12 head'); - var typebutton = headerwrap.append('div') - .attr('class','grid-button-wrap col4') - .append('div') - .attr('class','col12 grid-entry'); - - typebutton.append('div') - .attr('class', 'icon' + (preset ? ' feature-' + (preset.icon || 'marker-stroked') : '')); - - typebutton.node().focus(); - var namewrap = headerwrap.append('div') - .attr('class', 'name fillL inspector-inner col8'); - - typebutton.append('span') - .attr('class','label') - .text(preset.name()); + .attr('class', 'name fillL inspector-inner col12'); namewrap.append('h4') .text(t('inspector.name')); From d8967d501523f34c5b3186781abbddefd238a5b8 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 20 Mar 2013 15:40:07 -0400 Subject: [PATCH 09/10] Remove name seperator in editor --- css/app.css | 4 ++-- data/locales.js | 2 +- js/id/ui/tag_editor.js | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/css/app.css b/css/app.css index 5c4f77470..3a47ed571 100644 --- a/css/app.css +++ b/css/app.css @@ -656,6 +656,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} border-right: 1px solid #CCC; width: 12.5%; text-align: center; + overflow: hidden; } .inspector-wrap .message div.fl .icon{ @@ -892,8 +893,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} } .inspector-body .name { - height: 110px; - border-bottom: 1px solid #ccc; + padding-bottom: 0; } .name input.major { diff --git a/data/locales.js b/data/locales.js index 6958b09ef..c8f52c157 100644 --- a/data/locales.js +++ b/data/locales.js @@ -175,7 +175,7 @@ locale.en = { "okay": "Okay", "view_on_osm": "View on OSM", "name": "Name", - "editing": "Edit details", + "editing_feature": "Editing {feature}", "additional": "Additional tags", "choose": "Select feature type", "results": "{n} results for {search}", diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index bfbda692c..ccf903ab9 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -44,7 +44,7 @@ iD.ui.TagEditor = function(context, entity) { messagewrap.append('h3') .attr('class', 'inspector-inner fl') - .text('Editing ' + preset.name()); + .text(t('inspector.editing_feature', { feature: preset.name() })); messagewrap.append('button') .attr('class', 'preset-close fr') @@ -55,9 +55,7 @@ iD.ui.TagEditor = function(context, entity) { var editorwrap = selection.append('div') .attr('class', 'tag-wrap inspector-body fillL2 inspector-body-' + entity.geometry(context.graph())); - var headerwrap = editorwrap.append('div').attr('class','col12 head'); - - var namewrap = headerwrap.append('div') + var namewrap = editorwrap.append('div') .attr('class', 'name fillL inspector-inner col12'); namewrap.append('h4') From b517dcaa41ffbd403f823ef486847c466fba64d6 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 19 Mar 2013 19:53:15 -0700 Subject: [PATCH 10/10] Add ref field to highways --- data/presets/presets.json | 15 ++++++++++----- data/presets/presets/highway/motorway.json | 3 ++- data/presets/presets/highway/primary.json | 3 ++- data/presets/presets/highway/secondary.json | 3 ++- data/presets/presets/highway/tertiary.json | 3 ++- data/presets/presets/highway/trunk.json | 3 ++- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index fed256cf0..fa7c41333 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -971,7 +971,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" @@ -1007,7 +1008,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" @@ -1043,7 +1045,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" @@ -1097,7 +1100,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" @@ -1147,7 +1151,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index 66db9b33d..0e857cd50 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -5,7 +5,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index 09bb751c1..4f11e28e0 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -5,7 +5,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index 44d3de1a3..5c53066ab 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -5,7 +5,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index 832d295d7..e4046b844 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -5,7 +5,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index 62aa1f0f3..88237fe81 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -5,7 +5,8 @@ "structure", "access", "maxspeed", - "surface" + "surface", + "ref" ], "geometry": [ "line"