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

Merge branch 'master' of github.com:systemed/iD

Browse Source
This commit is contained in:
Tom MacWright
2012-12-03 17:08:56 -05:00
parent bd1a34153a 65c1d632ed
commit 8401b1fd65
3 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+32 -32
View File
@@ -12,43 +12,43 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<script type='text/javascript' src='js/lib/lodash.js'></script>
<script type='text/javascript' src='js/lib/d3.v3.js'></script>
<script type='text/javascript' src='js/lib/sha.js'></script>
<script type='text/javascript' src='js/lib/ohauth.js'></script>
<script type='text/javascript' src='js/lib/jxon.js'></script>
<script type='text/javascript' src='js/lib/d3.typeahead.js'></script>
<script type='text/javascript' src='js/lib/d3.geo.tile.js'></script>
<script type='text/javascript' src='js/lib/d3.size.js'></script>
<script src='js/lib/lodash.js'></script>
<script src='js/lib/d3.v3.js'></script>
<script src='js/lib/sha.js'></script>
<script src='js/lib/ohauth.js'></script>
<script src='js/lib/jxon.js'></script>
<script src='js/lib/d3.typeahead.js'></script>
<script src='js/lib/d3.geo.tile.js'></script>
<script src='js/lib/d3.size.js'></script>
<script type='text/javascript' src='js/id/id.js'></script>
<script type='text/javascript' src='js/id/util.js'></script>
<script type='text/javascript' src='js/id/oauth.js'></script>
<script type='text/javascript' src='js/id/taginfo.js'></script>
<script type='text/javascript' src='js/id/renderer/style.js'></script>
<script type='text/javascript' src='js/id/renderer/background.js'></script>
<script type='text/javascript' src='js/id/renderer/map.js'></script>
<script type='text/javascript' src='js/id/renderer/hash.js'></script>
<script type='text/javascript' src='js/id/renderer/markers.js'></script>
<script type='text/javascript' src='js/id/ui/inspector.js'></script>
<script type='text/javascript' src='js/id/ui/commit.js'></script>
<script type='text/javascript' src='js/id/ui/loading.js'></script>
<script type='text/javascript' src='js/id/ui/userpanel.js'></script>
<script src='js/id/id.js'></script>
<script src='js/id/util.js'></script>
<script src='js/id/oauth.js'></script>
<script src='js/id/taginfo.js'></script>
<script src='js/id/renderer/style.js'></script>
<script src='js/id/renderer/background.js'></script>
<script src='js/id/renderer/map.js'></script>
<script src='js/id/renderer/hash.js'></script>
<script src='js/id/renderer/markers.js'></script>
<script src='js/id/ui/inspector.js'></script>
<script src='js/id/ui/commit.js'></script>
<script src='js/id/ui/loading.js'></script>
<script src='js/id/ui/userpanel.js'></script>
<script type='text/javascript' src='js/id/actions/modes.js'></script>
<script type='text/javascript' src='js/id/actions/actions.js'></script>
<script src='js/id/actions/modes.js'></script>
<script src='js/id/actions/actions.js'></script>
<script type='text/javascript' src='js/id/controller/controller.js'></script>
<script src='js/id/controller/controller.js'></script>
<script type='text/javascript' src='js/id/format/format.js'></script>
<script type='text/javascript' src='js/id/format/geojson.js'></script>
<script type='text/javascript' src='js/id/format/xml.js'></script>
<script src='js/id/format/format.js'></script>
<script src='js/id/format/geojson.js'></script>
<script src='js/id/format/xml.js'></script>
<script type='text/javascript' src='js/id/graph/entity.js'></script>
<script type='text/javascript' src='js/id/graph/way.js'></script>
<script type='text/javascript' src='js/id/graph/graph.js'></script>
<script type='text/javascript' src='js/id/graph/history.js'></script>
<script type='text/javascript' src='js/id/connection.js'></script>
<script src='js/id/graph/entity.js'></script>
<script src='js/id/graph/way.js'></script>
<script src='js/id/graph/graph.js'></script>
<script src='js/id/graph/history.js'></script>
<script src='js/id/connection.js'></script>
</head>
<body>
<div id="iD"></div>
js/id/renderer/map.js
+18 -8
View File
@@ -14,6 +14,7 @@ iD.Map = function() {
.on('zoom', zoomPan),
only,
dblclickEnabled = true,
dragging = false,
dragbehavior = d3.behavior.drag()
.origin(function(entity) {
if (entity.accuracy) {
@@ -24,21 +25,30 @@ iD.Map = function() {
map.perform(iD.actions.addWayNode(connectedWay, entity));
}
var p = projection(ll2a(entity));
only = iD.Util.trueObj([entity.id].concat(
_.pluck(map.history.graph().parents(entity.id), 'id')));
return { x: p[0], y: p[1] };
})
.on('dragstart', function() {
map.history.perform(iD.actions.noop());
d3.event.sourceEvent.stopPropagation();
})
.on('drag', function(entity) {
var to = projection.invert([d3.event.x, d3.event.y]);
d3.event.sourceEvent.stopPropagation();
if (!dragging) {
dragging = true;
only = iD.Util.trueObj([entity.id].concat(
_.pluck(map.history.graph().parents(entity.id), 'id')));
map.history.perform(iD.actions.noop());
}
var to = projection.invert([d3.event.x, d3.event.y]);
map.history.replace(iD.actions.move(entity, to));
redraw(only);
})
.on('dragend', redraw),
.on('dragend', function () {
if (dragging) {
dragging = false;
map.update();
redraw();
}
}),
nodeline = function(d) {
return 'M' + d.nodes.map(ll2a).map(projection).map(roundCoords).join('L');
},
test/index.html
+1
View File
@@ -28,6 +28,7 @@
<script src='../js/id/id.js'></script>
<script src='../js/id/util.js'></script>
<script src='../js/id/oauth.js'></script>
<script src='../js/id/taginfo.js'></script>
<script src='../js/id/renderer/style.js'></script>
<script src='../js/id/renderer/background.js'></script>