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

Discard tags

Browse Source
This commit is contained in:
Tom MacWright
2013-02-06 16:22:39 -05:00
parent 4a07c42d2b
commit 3440f4254d
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.js
+1 -9
View File
@@ -108,13 +108,5 @@ iD.data.deprecated = [
shop: 'supermarket',
organic: 'only'
}
},
// entirely discarded tags
{ old: { 'tiger:upload_uuid': '*' } },
{ old: { 'tiger:tlid': '*' } },
{ old: { 'tiger:source': '*' } },
{ old: { 'tiger:separated': '*' } },
{ old: { 'geobase:datasetName': '*' } },
{ old: { 'geobase:uuid': '*' } },
{ old: { 'sub_sea:type': '*' } }
}
];
data/discarded.js
+10
View File
@@ -0,0 +1,10 @@
// entirely discarded tags
iD.data.discarded = [
'tiger:upload_uuid',
'tiger:tlid',
'tiger:source',
'tiger:separated',
'geobase:datasetName',
'geobase:uuid',
'sub_sea:type'
];
index.html
+2
View File
@@ -90,6 +90,7 @@
<script src='js/id/actions/noop.js'></script>
<script src='js/id/actions/reverse.js'></script>
<script src='js/id/actions/split.js'></script>
<script src='js/id/actions/discard_tags.js'></script>
<script src='js/id/behavior.js'></script>
<script src='js/id/behavior/add_way.js'></script>
@@ -137,6 +138,7 @@
<script src='data/data.js'></script>
<script src='data/deprecated.js'></script>
<script src='data/discarded.js'></script>
</head>
<body>
<div id='iD'></div><script>
js/id/behavior/select.js
+1 -1
View File
@@ -42,7 +42,7 @@ iD.behavior.Select = function(context) {
selection.on('mousemove.select', null);
};
// save the event for the click handler
})(d3.event), 400);
})(d3.event), 200);
}
}
js/id/graph/history.js
+7 -3
View File
@@ -18,7 +18,11 @@ iD.History = function(context) {
graph = actions[i](graph);
}
return {graph: graph, annotation: annotation, imagery_used: imagery_used};
return {
graph: graph,
annotation: annotation,
imagery_used: imagery_used
};
}
function change(previous) {
@@ -129,8 +133,8 @@ iD.History = function(context) {
changes: function() {
var difference = history.difference();
return {
modified: difference.modified(),
created: difference.created(),
modified: difference.modified().map(iD.actions.DiscardTags),
created: difference.created().map(iD.actions.DiscardTags),
deleted: difference.deleted()
};
},