CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into layers

Browse Source
This commit is contained in:
Tom MacWright
2013-03-20 16:04:09 -04:00
parent 0d2295817d b517dcaa41
commit f6fe9bfdbf
15 changed files with 3204 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.js
+1 -1
View File
@@ -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));
css/app.css
+21 -3
View File
@@ -649,11 +649,22 @@ 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;
overflow: hidden;
}
.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 {
@@ -882,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 {
@@ -1199,7 +1209,12 @@ div.combobox {
border-radius: 0;
}
.tag-row:hover input.value {
.tag-row button.tag-help {
left: -20px
}
.tag-row:hover input.value,
.tag-row:hover input.key {
border-radius: 0;
}
@@ -1207,6 +1222,9 @@ div.combobox {
opacity: 1;
}
/* Adding form fields to tag editor */
.inspector-inner .add-tag {
height: 30px;
border-top: 0;
data/core.yaml
+1 -1
View File
@@ -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}"
data/locales.js
+1 -1
View File
@@ -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}",
data/presets/presets.json
+10 -5
View File
@@ -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"
data/presets/presets/highway/motorway.json
+2 -1
View File
@@ -5,7 +5,8 @@
"structure",
"access",
"maxspeed",
"surface"
"surface",
"ref"
],
"geometry": [
"line"
data/presets/presets/highway/primary.json
+2 -1
View File
@@ -5,7 +5,8 @@
"structure",
"access",
"maxspeed",
"surface"
"surface",
"ref"
],
"geometry": [
"line"
data/presets/presets/highway/secondary.json
+2 -1
View File
@@ -5,7 +5,8 @@
"structure",
"access",
"maxspeed",
"surface"
"surface",
"ref"
],
"geometry": [
"line"
data/presets/presets/highway/tertiary.json
+2 -1
View File
@@ -5,7 +5,8 @@
"structure",
"access",
"maxspeed",
"surface"
"surface",
"ref"
],
"geometry": [
"line"
data/presets/presets/highway/trunk.json
+2 -1
View File
@@ -5,7 +5,8 @@
"structure",
"access",
"maxspeed",
"surface"
"surface",
"ref"
],
"geometry": [
"line"
img/source/line-presets.svg
+3141 -233
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 294 KiB

js/id/presets.js
+1 -1
View File
@@ -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' },
js/id/ui/preset_grid.js
+2
View File
@@ -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);
js/id/ui/tag_editor.js
+8 -19
View File
@@ -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(t('inspector.editing_feature', { feature: preset.name() }));
messagewrap.append('button')
.attr('class', 'preset-close fr')
@@ -50,24 +55,8 @@ 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 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());
var namewrap = editorwrap.append('div')
.attr('class', 'name fillL inspector-inner col12');
namewrap.append('h4')
.text(t('inspector.name'));
js/id/ui/taglist.js
+8
View File
@@ -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;