CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset CSS, permalink back to OSM, and faster attributes parsing

Browse Source
This commit is contained in:
Tom MacWright
2012-10-26 16:02:26 -04:00
parent 153bc51d6b
commit 8cc179d807
7 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
css/app.css
View File

@@ -29,7 +29,7 @@ p {
font-size: x-small;
}
a:visited, a {
color: black;
color: #345692;
}
input[type=text] {
@@ -155,6 +155,15 @@ table td {
background:#fff;
}
.inspector-wrap h2 {
font: normal 20px/20px 'Helvetica';
}
.inspector-wrap a.permalink {
text-decoration:none;
font: normal 11px/20px 'Helvetica'
}
.inspector thead th {
font-size:10px;
line-height:10px;

48
css/reset.css Normal file
View File

@@ -0,0 +1,48 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}

1
index.html
View File

@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>iD</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/map.css">
<link rel="stylesheet" href="css/app.css">
</head>

43
js/iD/Connection.js
View File

@@ -15,7 +15,7 @@ iD.Connection = function(apiURL) {
var connection = {};
function all() {
return _.values(entities);
return d3.values(entities);
}
function assign(obj) {
@@ -26,7 +26,11 @@ iD.Connection = function(apiURL) {
if (!entities[obj.id]) {
entities[obj.id] = obj;
} else {
entities[obj.id].nodes = obj.nodes;
/*
for (var n = 0; n < obj.nodes.length; n++) {
entities[obj.id].addNode(obj.nodes[n]);
}
*/
}
} else if (obj.entityType === 'relation') {
if (!relations[obj.id]) relations[obj.id] = obj;
@@ -71,24 +75,21 @@ iD.Connection = function(apiURL) {
function getObjectsByBbox(extent) {
// summary: Find all drawable entities that are within a given bounding box.
// Each one is an array of entities.
return _.filter(this.entities, function(e, id) {
return d3.values(entities).filter(function(e, id) {
return e.within(extent);
});
}
// Request data within the bbox from an external OSM server.
function loadFromAPI(box, callback) {
// summary: Request data within the bbox from an external OSM server. Currently hardcoded
// to use Overpass API (which has the relevant CORS headers).
loadFromURL('http://www.overpass-api.de/api/xapi?map?bbox=' +
[box[0][0], box[1][1], box[1][0], box[0][1]], callback);
}
function loadFromURL(url, callback) {
// summary: Load all data from a given URL.
d3.xml(url, parse(callback));
}
// Private functions to parse DOM created from XML file
function filterNodeName(n) {
return function(item) { return item.nodeName === n; };
}
@@ -102,11 +103,7 @@ iD.Connection = function(apiURL) {
}
function getAttribute(obj, name) {
for (var i = 0; i < obj.attributes.length; i++) {
if (obj.attributes[i].nodeName === name) {
return obj.attributes[i].nodeValue;
}
}
return obj.attributes[name].nodeValue;
}
function getTags(obj) {
@@ -134,16 +131,20 @@ iD.Connection = function(apiURL) {
}
function getMembers(obj) {
return _(obj.childNodes).chain()
.filter(filterNodeName('member'))
.map(function(item) {
var id = getAttribute(item,'ref'),
type = getAttribute(item,'type'),
role = getAttribute(item,'role');
var members = [];
for (var i = 0; i < obj.childNodes.length; i++) {
if (obj.childNodes[i].nodeName !== 'member') continue;
var obj = getOrCreate(id, type);
return new iD.RelationMember(obj, role);
}).value();
var item = obj.childNodes[i];
var id = item.attributes.ref.nodeValue,
type = item.attributes.type.nodeValue,
role = item.attributes.role.nodeValue;
var o = getOrCreate(id, type);
members.push(new iD.RelationMember(o, role));
}
return members;
}
function parse(callback) {

10
js/iD/Way.js
View File

@@ -19,14 +19,20 @@ iD.Way = function(connection, id, nodes, tags, loaded) {
this.tags = tags || {};
this.loaded = (loaded === undefined) ? true : loaded;
this.modified = this.id < 0;
this.nodes = nodes || [];
this.nodes = [];
this.extent = {};
for (var i = 0; i < nodes.length; i++) {
nodes[i].entity.addParent(this);
this.addNode(nodes[i]);
}
};
iD.Way.prototype = {
addNode: function(node) {
node.entity.addParent(this);
this.nodes.push(node);
return this;
},
// JOSM: http://josm.openstreetmap.de/browser/josm/trunk/src/org/openstreetmap/josm/data/osm/Way.java#L466
isClosed: function() {

14
js/iD/renderer/Map.js
View File

@@ -52,7 +52,13 @@ iD.Map = function(obj) {
var surface = d3.selectAll(obj.selector)
.append('svg')
.attr({ width: width, height: width })
.call(zoombehavior);
.call(zoombehavior).on('dblclick', function() {
// TODO: round zooms
/*
var s = projection.scale();
projection.scale(Math.round(Math.max(Math.log(s) / Math.log(2) - 7, 0)));
*/
});
var defs = surface.append('defs');
@@ -155,11 +161,6 @@ iD.Map = function(obj) {
d3.select('.inspector-wrap').datum(d).call(inspector);
}
inspector.on('update', function(way, tags) {
connection.entities[way.id].tags = tags;
drawVector();
});
function nodeline(d) {
return linegen(d.nodes);
}
@@ -321,7 +322,6 @@ iD.Map = function(obj) {
return coords;
}
function tileUrl(coord) {
var tmpl = 'http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z';
var u = '';

16
js/iD/ui/Inspector.js
View File

@@ -4,7 +4,21 @@ iD.Inspector = function(selection) {
function inspector(selection) {
// http://jsfiddle.net/7WQjr/
selection.each(function(d, i) {
d3.select(this).selectAll('table,button').remove();
// TODO: there must be a better way to do this.
d3.select(this).node().innerHTML = '';
var head = d3.select(this)
.append('div')
.attr('class', 'head');
head.append('h2')
.text(iD.Util.friendlyName(d));
head.append('a')
.attr('class', 'permalink')
.attr('href', 'http://www.openstreetmap.org/browse/' +
d.entityType + '/' + d.id)
.text('#' + d.id);
var table = d3.select(this)
.append('table')