}
})(this);
-d3 = (function(){
- var d3 = {version: "3.3.10"}; // semver
-d3.ascending = function(a, b) {
+!function(){
+ var d3 = {version: "3.4.6"}; // semver
+d3.ascending = d3_ascending;
+
+function d3_ascending(a, b) {
return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
-};
+}
d3.descending = function(a, b) {
return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
};
}
d3.mean = function(array, f) {
- var n = array.length,
+ var s = 0,
+ n = array.length,
a,
- m = 0,
i = -1,
- j = 0;
+ j = n;
if (arguments.length === 1) {
- while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ while (++i < n) if (d3_number(a = array[i])) s += a; else --j;
} else {
- while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += a; else --j;
}
- return j ? m : undefined;
+ return j ? s / j : undefined;
};
// R-7 per <http://en.wikipedia.org/wiki/Quantile>
d3.quantile = function(values, p) {
d3.median = function(array, f) {
if (arguments.length > 1) array = array.map(f);
array = array.filter(d3_number);
- return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
+ return array.length ? d3.quantile(array.sort(d3_ascending), .5) : undefined;
};
-d3.bisector = function(f) {
+
+function d3_bisector(compare) {
return {
left: function(a, x, lo, hi) {
if (arguments.length < 3) lo = 0;
if (arguments.length < 4) hi = a.length;
while (lo < hi) {
var mid = lo + hi >>> 1;
- if (f.call(a, a[mid], mid) < x) lo = mid + 1;
+ if (compare(a[mid], x) < 0) lo = mid + 1;
else hi = mid;
}
return lo;
if (arguments.length < 4) hi = a.length;
while (lo < hi) {
var mid = lo + hi >>> 1;
- if (x < f.call(a, a[mid], mid)) hi = mid;
+ if (compare(a[mid], x) > 0) hi = mid;
else lo = mid + 1;
}
return lo;
}
};
-};
+}
-var d3_bisector = d3.bisector(function(d) { return d; });
-d3.bisectLeft = d3_bisector.left;
-d3.bisect = d3.bisectRight = d3_bisector.right;
+var d3_bisect = d3_bisector(d3_ascending);
+d3.bisectLeft = d3_bisect.left;
+d3.bisect = d3.bisectRight = d3_bisect.right;
+
+d3.bisector = function(f) {
+ return d3_bisector(f.length === 1
+ ? function(d, x) { return d3_ascending(f(d), x); }
+ : f);
+};
d3.shuffle = function(array) {
var m = array.length, t, i;
while (m) {
function d3_Map() {}
d3_class(d3_Map, {
- has: function(key) {
- return d3_map_prefix + key in this;
- },
+ has: d3_map_has,
get: function(key) {
return this[d3_map_prefix + key];
},
set: function(key, value) {
return this[d3_map_prefix + key] = value;
},
- remove: function(key) {
- key = d3_map_prefix + key;
- return key in this && delete this[key];
- },
- keys: function() {
- var keys = [];
- this.forEach(function(key) { keys.push(key); });
- return keys;
- },
+ remove: d3_map_remove,
+ keys: d3_map_keys,
values: function() {
var values = [];
this.forEach(function(key, value) { values.push(value); });
this.forEach(function(key, value) { entries.push({key: key, value: value}); });
return entries;
},
+ size: d3_map_size,
+ empty: d3_map_empty,
forEach: function(f) {
- for (var key in this) {
- if (key.charCodeAt(0) === d3_map_prefixCode) {
- f.call(this, key.substring(1), this[key]);
- }
- }
+ for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.substring(1), this[key]);
}
});
var d3_map_prefix = "\0", // prevent collision with built-ins
d3_map_prefixCode = d3_map_prefix.charCodeAt(0);
+function d3_map_has(key) {
+ return d3_map_prefix + key in this;
+}
+
+function d3_map_remove(key) {
+ key = d3_map_prefix + key;
+ return key in this && delete this[key];
+}
+
+function d3_map_keys() {
+ var keys = [];
+ this.forEach(function(key) { keys.push(key); });
+ return keys;
+}
+
+function d3_map_size() {
+ var size = 0;
+ for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) ++size;
+ return size;
+}
+
+function d3_map_empty() {
+ for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) return false;
+ return true;
+}
+
d3.nest = function() {
var nest = {},
keys = [],
function d3_Set() {}
d3_class(d3_Set, {
- has: function(value) {
- return d3_map_prefix + value in this;
- },
+ has: d3_map_has,
add: function(value) {
this[d3_map_prefix + value] = true;
return value;
value = d3_map_prefix + value;
return value in this && delete this[value];
},
- values: function() {
- var values = [];
- this.forEach(function(value) {
- values.push(value);
- });
- return values;
- },
+ values: d3_map_keys,
+ size: d3_map_size,
+ empty: d3_map_empty,
forEach: function(f) {
- for (var value in this) {
- if (value.charCodeAt(0) === d3_map_prefixCode) {
- f.call(this, value.substring(1));
- }
- }
+ for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.substring(1));
}
});
d3.behavior = {};
// Prefer Sizzle, if available.
if (typeof Sizzle === "function") {
d3_select = function(s, n) { return Sizzle(s, n)[0] || null; };
- d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+ d3_selectAll = Sizzle;
d3_selectMatches = Sizzle.matchesSelector;
}
// probably doesn't support it on SVG elements (which can be animated).
if (typeof name === "string") {
var node = this.node(),
- n = (name = name.trim().split(/^|\s+/g)).length,
+ n = (name = d3_selection_classes(name)).length,
i = -1;
if (value = node.classList) {
while (++i < n) if (!value.contains(name[i])) return false;
return new RegExp("(?:^|\\s+)" + d3.requote(name) + "(?:\\s+|$)", "g");
}
+function d3_selection_classes(name) {
+ return name.trim().split(/^|\s+/);
+}
+
// Multiple class names are allowed (e.g., "foo bar").
function d3_selection_classed(name, value) {
- name = name.trim().split(/\s+/).map(d3_selection_classedName);
+ name = d3_selection_classes(name).map(d3_selection_classedName);
var n = name.length;
function classedConstant() {
};
function d3_selection_sortComparator(comparator) {
- if (!arguments.length) comparator = d3.ascending;
+ if (!arguments.length) comparator = d3_ascending;
return function(a, b) {
return a && b ? comparator(a.__data__, b.__data__) : !a - !b;
};
return d3_mousePoint(container, d3_eventSource());
};
-// https://bugs.webkit.org/show_bug.cgi?id=44083
-var d3_mouse_bug44083 = /WebKit/.test(d3_window.navigator.userAgent) ? -1 : 0;
-
function d3_mousePoint(container, e) {
if (e.changedTouches) e = e.changedTouches[0];
var svg = container.ownerSVGElement || container;
if (svg.createSVGPoint) {
var point = svg.createSVGPoint();
- if (d3_mouse_bug44083 < 0 && (d3_window.scrollX || d3_window.scrollY)) {
- svg = d3.select("body").append("svg").style({
- position: "absolute",
- top: 0,
- left: 0,
- margin: 0,
- padding: 0,
- border: "none"
- }, "important");
- var ctm = svg[0][0].getScreenCTM();
- d3_mouse_bug44083 = !(ctm.f || ctm.e);
- svg.remove();
- }
- if (d3_mouse_bug44083) point.x = e.pageX, point.y = e.pageY;
- else point.x = e.clientX, point.y = e.clientY;
+ point.x = e.clientX, point.y = e.clientY;
point = point.matrixTransform(container.getScreenCTM().inverse());
return [point.x, point.y];
}
return x > 0 ? 1 : x < 0 ? -1 : 0;
}
+// Returns the 2D cross product of AB and AC vectors, i.e., the z-component of
+// the 3D cross product in a quadrant I Cartesian coordinate system (+x is
+// right, +y is up). Returns a positive value if ABC is counter-clockwise,
+// negative if clockwise, and zero if the points are collinear.
+function d3_cross2d(a, b, c) {
+ return (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0]);
+}
+
function d3_acos(x) {
return x > 1 ? 0 : x < -1 ? π : Math.acos(x);
}
zoom.event = function(g) {
g.each(function() {
- var event_ = event.of(this, arguments),
+ var dispatch = event.of(this, arguments),
view1 = view;
if (d3_transitionInheritId) {
- d3.select(this).transition()
- .each("start.zoom", function() {
- view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
- zoomstarted(event_);
- })
- .tween("zoom:zoom", function() {
- var dx = size[0],
- dy = size[1],
- cx = dx / 2,
- cy = dy / 2,
- i = d3.interpolateZoom(
- [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
- [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
- );
- return function(t) {
- var l = i(t), k = dx / l[2];
- this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
- zoomed(event_);
- };
- })
- .each("end.zoom", function() {
- zoomended(event_);
- });
+ d3.select(this).transition()
+ .each("start.zoom", function() {
+ view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
+ zoomstarted(dispatch);
+ })
+ .tween("zoom:zoom", function() {
+ var dx = size[0],
+ dy = size[1],
+ cx = dx / 2,
+ cy = dy / 2,
+ i = d3.interpolateZoom(
+ [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
+ [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
+ );
+ return function(t) {
+ var l = i(t), k = dx / l[2];
+ this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
+ zoomed(dispatch);
+ };
+ })
+ .each("end.zoom", function() {
+ zoomended(dispatch);
+ });
} else {
this.__chart__ = view;
- zoomstarted(event_);
- zoomed(event_);
- zoomended(event_);
+ zoomstarted(dispatch);
+ zoomed(dispatch);
+ zoomended(dispatch);
}
});
}
if (y1) y1.domain(y0.range().map(function(y) { return (y - view.y) / view.k; }).map(y0.invert));
}
- function zoomstarted(event) {
- event({type: "zoomstart"});
+ function zoomstarted(dispatch) {
+ dispatch({type: "zoomstart"});
}
- function zoomed(event) {
+ function zoomed(dispatch) {
rescale();
- event({type: "zoom", scale: view.k, translate: [view.x, view.y]});
+ dispatch({type: "zoom", scale: view.k, translate: [view.x, view.y]});
}
- function zoomended(event) {
- event({type: "zoomend"});
+ function zoomended(dispatch) {
+ dispatch({type: "zoomend"});
}
function mousedowned() {
- var target = this,
- event_ = event.of(target, arguments),
- eventTarget = d3.event.target,
+ var that = this,
+ target = d3.event.target,
+ dispatch = event.of(that, arguments),
dragged = 0,
- w = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
- l = location(d3.mouse(target)),
+ subject = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
+ location0 = location(d3.mouse(that)),
dragRestore = d3_event_dragSuppress();
- d3_selection_interrupt.call(target);
- zoomstarted(event_);
+ d3_selection_interrupt.call(that);
+ zoomstarted(dispatch);
function moved() {
dragged = 1;
- translateTo(d3.mouse(target), l);
- zoomed(event_);
+ translateTo(d3.mouse(that), location0);
+ zoomed(dispatch);
}
function ended() {
- w.on(mousemove, d3_window === target ? mousewheelreset : null).on(mouseup, null);
- dragRestore(dragged && d3.event.target === eventTarget);
- zoomended(event_);
+ subject.on(mousemove, d3_window === that ? mousewheelreset : null).on(mouseup, null);
+ dragRestore(dragged && d3.event.target === target);
+ zoomended(dispatch);
}
}
// These closures persist for as long as at least one touch is active.
function touchstarted() {
- var target = this,
- event_ = event.of(target, arguments),
+ var that = this,
+ dispatch = event.of(that, arguments),
locations0 = {}, // touchstart locations
distance0 = 0, // distance² between initial touches
scale0, // scale when we started touching
- eventId = d3.event.changedTouches[0].identifier,
- touchmove = "touchmove.zoom-" + eventId,
- touchend = "touchend.zoom-" + eventId,
- w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended),
- t = d3.select(target).on(mousedown, null).on(touchstart, started), // prevent duplicate events
+ zoomName = ".zoom-" + d3.event.changedTouches[0].identifier,
+ touchmove = "touchmove" + zoomName,
+ touchend = "touchend" + zoomName,
+ target = d3.select(d3.event.target).on(touchmove, moved).on(touchend, ended),
+ subject = d3.select(that).on(mousedown, null).on(touchstart, started), // prevent duplicate events
dragRestore = d3_event_dragSuppress();
- d3_selection_interrupt.call(target);
+ d3_selection_interrupt.call(that);
started();
- zoomstarted(event_);
+ zoomstarted(dispatch);
// Updates locations of any touches in locations0.
function relocate() {
- var touches = d3.touches(target);
+ var touches = d3.touches(that);
scale0 = view.k;
touches.forEach(function(t) {
if (t.identifier in locations0) locations0[t.identifier] = location(t);
scaleTo(view.k * 2);
translateTo(p, l);
d3_eventPreventDefault();
- zoomed(event_);
+ zoomed(dispatch);
}
touchtime = now;
} else if (touches.length > 1) {
}
function moved() {
- var touches = d3.touches(target),
+ var touches = d3.touches(that),
p0, l0,
p1, l1;
for (var i = 0, n = touches.length; i < n; ++i, l1 = null) {
touchtime = null;
translateTo(p0, l0);
- zoomed(event_);
+ zoomed(dispatch);
}
function ended() {
}
}
// Otherwise, remove touchmove and touchend listeners.
- w.on(touchmove, null).on(touchend, null);
- t.on(mousedown, mousedowned).on(touchstart, touchstarted);
+ target.on(zoomName, null);
+ subject.on(mousedown, mousedowned).on(touchstart, touchstarted);
dragRestore();
- zoomended(event_);
+ zoomended(dispatch);
}
}
function mousewheeled() {
- var event_ = event.of(this, arguments);
+ var dispatch = event.of(this, arguments);
if (mousewheelTimer) clearTimeout(mousewheelTimer);
- else d3_selection_interrupt.call(this), zoomstarted(event_);
- mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50);
+ else d3_selection_interrupt.call(this), zoomstarted(dispatch);
+ mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(dispatch); }, 50);
d3_eventPreventDefault();
var point = center || d3.mouse(this);
if (!translate0) translate0 = location(point);
scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * view.k);
translateTo(point, translate0);
- zoomed(event_);
+ zoomed(dispatch);
}
function mousewheelreset() {
}
function dblclicked() {
- var event_ = event.of(this, arguments),
+ var dispatch = event.of(this, arguments),
p = d3.mouse(this),
l = location(p),
k = Math.log(view.k) / Math.LN2;
- zoomstarted(event_);
+ zoomstarted(dispatch);
scaleTo(Math.pow(2, d3.event.shiftKey ? Math.ceil(k) - 1 : Math.floor(k) + 1));
translateTo(p, l);
- zoomed(event_);
- zoomended(event_);
+ zoomed(dispatch);
+ zoomended(dispatch);
}
return d3.rebind(zoom, event, "on");
d3.functor = d3_functor;
+d3.touch = function(container, touches, identifier) {
+ if (arguments.length < 3) identifier = touches, touches = d3_eventSource().changedTouches;
+ if (touches) for (var i = 0, n = touches.length, touch; i < n; ++i) {
+ if ((touch = touches[i]).identifier === identifier) {
+ return d3_mousePoint(container, touch);
+ }
+ }
+};
+
var d3_timer_queueHead,
d3_timer_queueTail,
d3_timer_interval, // is an interval (or frame) active?
clip.lineEnd = ringEnd;
segments = [];
polygon = [];
- listener.polygonStart();
},
polygonEnd: function() {
clip.point = point;
segments = d3.merge(segments);
var clipStartInside = d3_geo_pointInPolygon(rotatedClipStart, polygon);
if (segments.length) {
+ if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
d3_geo_clipPolygon(segments, d3_geo_clipSort, clipStartInside, interpolate, listener);
} else if (clipStartInside) {
+ if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
listener.lineStart();
interpolate(null, null, 1, listener);
listener.lineEnd();
}
- listener.polygonEnd();
+ if (polygonStarted) listener.polygonEnd(), polygonStarted = false;
segments = polygon = null;
},
sphere: function() {
var buffer = d3_geo_clipBufferListener(),
ringListener = clipLine(buffer),
+ polygonStarted = false,
polygon,
ring;
var n = segment.length - 1,
i = -1,
point;
- listener.lineStart();
- while (++i < n) listener.point((point = segment[i])[0], point[1]);
- listener.lineEnd();
+ if (n > 0) {
+ if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
+ listener.lineStart();
+ while (++i < n) listener.point((point = segment[i])[0], point[1]);
+ listener.lineEnd();
+ }
return;
}
// previous point, current point. Uses a formula derived from Cagnoli’s
// theorem. See Todhunter, Spherical Trig. (1871), Sec. 103, Eq. (2).
var dλ = λ - λ0,
+ sdλ = dλ >= 0 ? 1 : -1,
+ adλ = sdλ * dλ,
cosφ = Math.cos(φ),
sinφ = Math.sin(φ),
k = sinφ0 * sinφ,
- u = cosφ0 * cosφ + k * Math.cos(dλ),
- v = k * Math.sin(dλ);
+ u = cosφ0 * cosφ + k * Math.cos(adλ),
+ v = k * sdλ * Math.sin(adλ);
d3_geo_areaRingSum.add(Math.atan2(v, u));
// Advance the previous points.
sinφ = Math.sin(φ),
cosφ = Math.cos(φ),
dλ = λ - λ0,
- antimeridian = abs(dλ) > π,
+ sdλ = dλ >= 0 ? 1 : -1,
+ adλ = sdλ * dλ,
+ antimeridian = adλ > π,
k = sinφ0 * sinφ;
- d3_geo_areaRingSum.add(Math.atan2(k * Math.sin(dλ), cosφ0 * cosφ + k * Math.cos(dλ)));
+ d3_geo_areaRingSum.add(Math.atan2(k * sdλ * Math.sin(adλ), cosφ0 * cosφ + k * Math.cos(adλ)));
- polarAngle += antimeridian ? dλ + (dλ >= 0 ? τ : -τ): dλ;
+ polarAngle += antimeridian ? dλ + sdλ * τ : dλ;
// Are the longitudes either side of the point's meridian, and are the
// latitudes smaller than the parallel?
for (var j = 1, v = polygon[i], m = v.length, a = v[0], b; j < m; ++j) {
b = v[j];
if (a[1] <= y) {
- if (b[1] > y && isLeft(a, b, p) > 0) ++wn;
+ if (b[1] > y && d3_cross2d(a, b, p) > 0) ++wn;
} else {
- if (b[1] <= y && isLeft(a, b, p) < 0) --wn;
+ if (b[1] <= y && d3_cross2d(a, b, p) < 0) --wn;
}
a = b;
}
return wn !== 0;
}
- function isLeft(a, b, c) {
- return (b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1]);
- }
-
function interpolate(from, to, direction, listener) {
var a = 0, a1 = 0;
if (from == null ||
b = coordinates[coordinates.length - 1];
return !(a[0] - b[0] || a[1] - b[1]);
}
+function d3_geom_pointX(d) {
+ return d[0];
+}
+
+function d3_geom_pointY(d) {
+ return d[1];
+}
+
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+ var x = d3_geom_pointX,
+ y = d3_geom_pointY;
+
+ if (arguments.length) return hull(vertices);
+
+ function hull(data) {
+ if (data.length < 3) return [];
+
+ var fx = d3_functor(x),
+ fy = d3_functor(y),
+ n = data.length,
+ vertices, // TODO use parallel arrays
+ plen = n - 1,
+ points = [],
+ stack = [],
+ d,
+ i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+ if (fx === d3_geom_pointX && y === d3_geom_pointY) vertices = data;
+ else for (i = 0, vertices = []; i < n; ++i) {
+ vertices.push([+fx.call(this, d = data[i], i), +fy.call(this, d, i)]);
+ }
+
+ // find the starting ref point: leftmost point with the minimum y coord
+ for (i = 1; i < n; ++i) {
+ if (vertices[i][1] < vertices[h][1]
+ || vertices[i][1] == vertices[h][1]
+ && vertices[i][0] < vertices[h][0]) h = i;
+ }
+
+ // calculate polar angles from ref point and sort
+ for (i = 0; i < n; ++i) {
+ if (i === h) continue;
+ y1 = vertices[i][1] - vertices[h][1];
+ x1 = vertices[i][0] - vertices[h][0];
+ points.push({angle: Math.atan2(y1, x1), index: i});
+ }
+ points.sort(function(a, b) { return a.angle - b.angle; });
+
+ // toss out duplicate angles
+ a = points[0].angle;
+ v = points[0].index;
+ u = 0;
+ for (i = 1; i < plen; ++i) {
+ j = points[i].index;
+ if (a == points[i].angle) {
+ // keep angle for point most distant from the reference
+ x1 = vertices[v][0] - vertices[h][0];
+ y1 = vertices[v][1] - vertices[h][1];
+ x2 = vertices[j][0] - vertices[h][0];
+ y2 = vertices[j][1] - vertices[h][1];
+ if (x1 * x1 + y1 * y1 >= x2 * x2 + y2 * y2) {
+ points[i].index = -1;
+ continue;
+ } else {
+ points[u].index = -1;
+ }
+ }
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+
+ // initialize the stack
+ stack.push(h);
+ for (i = 0, j = 0; i < 2; ++j) {
+ if (points[j].index > -1) {
+ stack.push(points[j].index);
+ i++;
+ }
+ }
+ sp = stack.length;
+
+ // do graham's scan
+ for (; j < plen; ++j) {
+ if (points[j].index < 0) continue; // skip tossed out points
+ while (!d3_geom_hullCCW(stack[sp - 2], stack[sp - 1], points[j].index, vertices)) {
+ --sp;
+ }
+ stack[sp++] = points[j].index;
+ }
+
+ // construct the hull
+ var poly = [];
+ for (i = sp - 1; i >= 0; --i) poly.push(data[stack[i]]);
+ return poly;
+ }
+
+ hull.x = function(_) {
+ return arguments.length ? (x = _, hull) : x;
+ };
+
+ hull.y = function(_) {
+ return arguments.length ? (y = _, hull) : y;
+ };
+
+ return hull;
+};
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+ var t, a, b, c, d, e, f;
+ t = v[i1]; a = t[0]; b = t[1];
+ t = v[i2]; c = t[0]; d = t[1];
+ t = v[i3]; e = t[0]; f = t[1];
+ return (f - b) * (c - a) - (d - b) * (e - a) > 0;
+}
var d3_ease_default = function() { return d3_identity; };
b = 0, // blue channel; int in [0, 255]
m1, // CSS color specification match
m2, // CSS color specification type (e.g., rgb)
- name;
+ color;
/* Handle hsl, rgb. */
m1 = /([a-z]+)\((.*)\)/i.exec(format);
}
/* Named colors. */
- if (name = d3_rgb_names.get(format)) return rgb(name.r, name.g, name.b);
+ if (color = d3_rgb_names.get(format)) return rgb(color.r, color.g, color.b);
/* Hexadecimal colors: #rgb and #rrggbb. */
- if (format != null && format.charAt(0) === "#") {
+ if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.substring(1), 16))) {
if (format.length === 4) {
- r = format.charAt(1); r += r;
- g = format.charAt(2); g += g;
- b = format.charAt(3); b += b;
+ r = (color & 0xf00) >> 4; r = (r >> 4) | r;
+ g = (color & 0xf0); g = (g >> 4) | g;
+ b = (color & 0xf); b = (b << 4) | b;
} else if (format.length === 7) {
- r = format.substring(1, 3);
- g = format.substring(3, 5);
- b = format.substring(5, 7);
+ r = (color & 0xff0000) >> 16;
+ g = (color & 0xff00) >> 8;
+ b = (color & 0xff);
}
- r = parseInt(r, 16);
- g = parseInt(g, 16);
- b = parseInt(b, 16);
}
return rgb(r, g, b);
d3.interpolateString = d3_interpolateString;
function d3_interpolateString(a, b) {
- var m, // current match
- i, // current index
- j, // current index (for coalescing)
- s0 = 0, // start index of current string prefix
- s1 = 0, // end index of current string prefix
+ var bi = d3_interpolate_numberA.lastIndex = d3_interpolate_numberB.lastIndex = 0, // scan index for next number in b
+ am, // current match in a
+ bm, // current match in b
+ bs, // string preceding current number in b, if any
+ i = -1, // index in s
s = [], // string constants and placeholders
- q = [], // number interpolators
- n, // q.length
- o;
+ q = []; // number interpolators
// Coerce inputs to strings.
a = a + "", b = b + "";
- // Reset our regular expression!
- d3_interpolate_number.lastIndex = 0;
-
- // Find all numbers in b.
- for (i = 0; m = d3_interpolate_number.exec(b); ++i) {
- if (m.index) s.push(b.substring(s0, s1 = m.index));
- q.push({i: s.length, x: m[0]});
- s.push(null);
- s0 = d3_interpolate_number.lastIndex;
- }
- if (s0 < b.length) s.push(b.substring(s0));
-
- // Find all numbers in a.
- for (i = 0, n = q.length; (m = d3_interpolate_number.exec(a)) && i < n; ++i) {
- o = q[i];
- if (o.x == m[0]) { // The numbers match, so coalesce.
- if (o.i) {
- if (s[o.i + 1] == null) { // This match is followed by another number.
- s[o.i - 1] += o.x;
- s.splice(o.i, 1);
- for (j = i + 1; j < n; ++j) q[j].i--;
- } else { // This match is followed by a string, so coalesce twice.
- s[o.i - 1] += o.x + s[o.i + 1];
- s.splice(o.i, 2);
- for (j = i + 1; j < n; ++j) q[j].i -= 2;
- }
- } else {
- if (s[o.i + 1] == null) { // This match is followed by another number.
- s[o.i] = o.x;
- } else { // This match is followed by a string, so coalesce twice.
- s[o.i] = o.x + s[o.i + 1];
- s.splice(o.i + 1, 1);
- for (j = i + 1; j < n; ++j) q[j].i--;
- }
- }
- q.splice(i, 1);
- n--;
- i--;
- } else {
- o.x = d3_interpolateNumber(parseFloat(m[0]), parseFloat(o.x));
- }
+ // Interpolate pairs of numbers in a & b.
+ while ((am = d3_interpolate_numberA.exec(a))
+ && (bm = d3_interpolate_numberB.exec(b))) {
+ if ((bs = bm.index) > bi) { // a string precedes the next number in b
+ bs = b.substring(bi, bs);
+ if (s[i]) s[i] += bs; // coalesce with previous string
+ else s[++i] = bs;
+ }
+ if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
+ if (s[i]) s[i] += bm; // coalesce with previous string
+ else s[++i] = bm;
+ } else { // interpolate non-matching numbers
+ s[++i] = null;
+ q.push({i: i, x: d3_interpolateNumber(am, bm)});
+ }
+ bi = d3_interpolate_numberB.lastIndex;
}
- // Remove any numbers in b not found in a.
- while (i < n) {
- o = q.pop();
- if (s[o.i + 1] == null) { // This match is followed by another number.
- s[o.i] = o.x;
- } else { // This match is followed by a string, so coalesce twice.
- s[o.i] = o.x + s[o.i + 1];
- s.splice(o.i + 1, 1);
- }
- n--;
+ // Add remains of b.
+ if (bi < b.length) {
+ bs = b.substring(bi);
+ if (s[i]) s[i] += bs; // coalesce with previous string
+ else s[++i] = bs;
}
// Special optimization for only a single match.
- if (s.length === 1) {
- return s[0] == null
- ? (o = q[0].x, function(t) { return o(t) + ""; })
- : function() { return b; };
- }
-
// Otherwise, interpolate each of the numbers and rejoin the string.
- return function(t) {
- for (i = 0; i < n; ++i) s[(o = q[i]).i] = o.x(t);
- return s.join("");
- };
+ return s.length < 2
+ ? (q[0] ? (b = q[0].x, function(t) { return b(t) + ""; })
+ : function() { return b; })
+ : (b = q.length, function(t) {
+ for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+ return s.join("");
+ });
}
-var d3_interpolate_number = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;
+var d3_interpolate_numberA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+ d3_interpolate_numberB = new RegExp(d3_interpolate_numberA.source, "g");
d3.interpolate = d3_interpolate;
var t = typeof b;
return (t === "string" ? (d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString)
: b instanceof d3_Color ? d3_interpolateRgb
- : t === "object" ? (Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject)
+ : Array.isArray(b) ? d3_interpolateArray
+ : t === "object" && isNaN(b) ? d3_interpolateObject
: d3_interpolateNumber)(a, b);
}
];
d3_transitionPrototype.delay = function(value) {
var id = this.id;
+ if (arguments.length < 1) return this.node().__transition__[id].delay;
return d3_selection_each(this, typeof value === "function"
? function(node, i, j) { node.__transition__[id].delay = +value.call(node, node.__data__, i, j); }
: (value = +value, function(node) { node.__transition__[id].delay = value; }));
d3_transitionPrototype.duration = function(value) {
var id = this.id;
+ if (arguments.length < 1) return this.node().__transition__[id].duration;
return d3_selection_each(this, typeof value === "function"
? function(node, i, j) { node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j)); }
: (value = Math.max(1, value), function(node) { node.__transition__[id].duration = value; }));
d3.xml = d3_xhrType(function(request) {
return request.responseXML;
});
- return d3;
-})();
+ if (typeof define === "function" && define.amd) {
+ define(d3);
+ } else if (typeof module === "object" && module.exports) {
+ module.exports = d3;
+ } else {
+ this.d3 = d3;
+ }
+}();
d3.combobox = function() {
var event = d3.dispatch('accept'),
data = [],
return d3.rebind(context, dispatch, 'on');
};
-iD.version = '1.3.9';
+iD.version = '1.3.10';
(function() {
var detected = {};
p1[1] + (p2[1] - p1[1]) * t];
};
+// 2D cross product of OA and OB vectors, i.e. z-component of their 3D cross product.
+// Returns a positive value, if OAB makes a counter-clockwise turn,
+// negative for clockwise turn, and zero if the points are collinear.
+iD.geo.cross = function(o, a, b) {
+ return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0]);
+};
+
// http://jsperf.com/id-dist-optimization
iD.geo.euclideanDistance = function(a, b) {
var x = a[0] - b[0], y = a[1] - b[1];
maxAngle = (maxAngle || 20) * Math.PI / 180;
var action = function(graph) {
- var way = graph.entity(wayId),
- nodes = _.uniq(graph.childNodes(way)),
+ var way = graph.entity(wayId);
+
+ if (!way.isConvex(graph)) {
+ graph = action.makeConvex(graph);
+ }
+
+ var nodes = _.uniq(graph.childNodes(way)),
keyNodes = nodes.filter(function(n) { return graph.parentWays(n).length !== 1; }),
points = nodes.map(function(n) { return projection(n.loc); }),
keyPoints = keyNodes.map(function(n) { return projection(n.loc); }),
- centroid = d3.geom.polygon(points).centroid(),
+ centroid = (points.length === 2) ? iD.geo.interp(points[0], points[1], 0.5) : d3.geom.polygon(points).centroid(),
radius = d3.median(points, function(p) { return iD.geo.euclideanDistance(centroid, p); }),
sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
ids;
// key points and nodes are those connected to the ways,
// they are projected onto the circle, inbetween nodes are moved
- // to constant internals between key nodes, extra inbetween nodes are
+ // to constant intervals between key nodes, extra inbetween nodes are
// added if necessary.
for (var i = 0; i < keyPoints.length; i++) {
var nextKeyNodeIndex = (i + 1) % keyNodes.length,
- startNodeIndex = nodes.indexOf(keyNodes[i]),
- endNodeIndex = nodes.indexOf(keyNodes[nextKeyNodeIndex]),
+ startNode = keyNodes[i],
+ endNode = keyNodes[nextKeyNodeIndex],
+ startNodeIndex = nodes.indexOf(startNode),
+ endNodeIndex = nodes.indexOf(endNode),
numberNewPoints = -1,
indexRange = endNodeIndex - startNodeIndex,
distance, totalAngle, eachAngle, startAngle, endAngle,
- angle, loc, node, j;
+ angle, loc, node, j,
+ inBetweenNodes = [];
if (indexRange < 0) {
indexRange += nodes.length;
// position this key node
distance = iD.geo.euclideanDistance(centroid, keyPoints[i]);
+ if (distance === 0) { distance = 1e-4; }
keyPoints[i] = [
centroid[0] + (keyPoints[i][0] - centroid[0]) / distance * radius,
centroid[1] + (keyPoints[i][1] - centroid[1]) / distance * radius];
totalAngle = endAngle - startAngle;
// detects looping around -pi/pi
- if (totalAngle*sign > 0) {
+ if (totalAngle * sign > 0) {
totalAngle = -sign * (2 * Math.PI - Math.abs(totalAngle));
}
graph = graph.replace(node);
nodes.splice(endNodeIndex + j, 0, node);
+ inBetweenNodes.push(node.id);
}
+
+ // Check for other ways that share these keyNodes..
+ // If keyNodes are adjacent in both ways,
+ // we can add inBetween nodes to that shared way too..
+ if (indexRange === 1 && inBetweenNodes.length) {
+ var startIndex1 = way.nodes.lastIndexOf(startNode.id),
+ endIndex1 = way.nodes.lastIndexOf(endNode.id),
+ wayDirection1 = (endIndex1 - startIndex1);
+ if (wayDirection1 < -1) { wayDirection1 = 1;}
+
+ /*jshint -W083 */
+ _.each(_.without(graph.parentWays(keyNodes[i]), way), function(sharedWay) {
+ if (sharedWay.areAdjacent(startNode.id, endNode.id)) {
+ var startIndex2 = sharedWay.nodes.lastIndexOf(startNode.id),
+ endIndex2 = sharedWay.nodes.lastIndexOf(endNode.id),
+ wayDirection2 = (endIndex2 - startIndex2),
+ insertAt = endIndex2;
+ if (wayDirection2 < -1) { wayDirection2 = 1;}
+
+ if (wayDirection1 !== wayDirection2) {
+ inBetweenNodes.reverse();
+ insertAt = startIndex2;
+ }
+ for (j = 0; j < inBetweenNodes.length; j++) {
+ sharedWay = sharedWay.addNode(inBetweenNodes[j], insertAt + j);
+ }
+ graph = graph.replace(sharedWay);
+ }
+ });
+ /*jshint +W083 */
+ }
+
}
// update the way to have all the new nodes
return graph;
};
+ action.makeConvex = function(graph) {
+ var way = graph.entity(wayId),
+ nodes = _.uniq(graph.childNodes(way)),
+ points = nodes.map(function(n) { return projection(n.loc); }),
+ sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
+ hull = d3.geom.hull(points);
+
+ // D3 convex hulls go counterclockwise..
+ if (sign === -1) {
+ nodes.reverse();
+ points.reverse();
+ }
+
+ for (var i = 0; i < hull.length - 1; i++) {
+ var startIndex = points.indexOf(hull[i]),
+ endIndex = points.indexOf(hull[i+1]),
+ indexRange = (endIndex - startIndex);
+
+ if (indexRange < 0) {
+ indexRange += nodes.length;
+ }
+
+ // move interior nodes to the surface of the convex hull..
+ for (var j = 1; j < indexRange; j++) {
+ var point = iD.geo.interp(hull[i], hull[i+1], j / indexRange),
+ node = nodes[(j + startIndex) % nodes.length].move(projection.invert(point));
+ graph = graph.replace(node);
+ }
+ }
+ return graph;
+ };
+
action.disabled = function(graph) {
if (!graph.entity(wayId).isClosed())
return 'not_closed';
};
operation.available = function() {
+ var entity = context.entity(entityId);
return selectedIDs.length === 1 &&
- context.entity(entityId).type === 'way';
+ entity.type === 'way' &&
+ _.uniq(entity.nodes).length > 1;
};
operation.disabled = function() {
"bench": true,
"clock": true,
"drinking_water": true,
+ "parking_entrance": true,
"post_box": true,
"telephone": true,
"vending_machine": true,
},
isOneWay: function() {
- return this.tags.oneway === 'yes' ||
- this.tags.oneway === '1' ||
- this.tags.oneway === '-1' ||
- this.tags.waterway === 'river' ||
+ // explicit oneway tag..
+ if (['yes', '1', '-1'].indexOf(this.tags.oneway) !== -1) { return true; }
+ if (['no', '0'].indexOf(this.tags.oneway) !== -1) { return false; }
+
+ // implied oneway tag..
+ return this.tags.waterway === 'river' ||
this.tags.waterway === 'stream' ||
+ this.tags.highway === 'motorway' ||
+ this.tags.highway === 'motorway_link' ||
this.tags.junction === 'roundabout';
},
return this.nodes.length > 0 && this.first() === this.last();
},
+ isConvex: function(resolver) {
+ if (!this.isClosed() || this.isDegenerate()) return null;
+
+ var nodes = _.uniq(resolver.childNodes(this)),
+ coords = _.pluck(nodes, 'loc'),
+ curr = 0, prev = 0;
+
+ for (var i = 0; i < coords.length; i++) {
+ var o = coords[(i+1) % coords.length],
+ a = coords[i],
+ b = coords[(i+2) % coords.length],
+ res = iD.geo.cross(o, a, b);
+
+ curr = (res > 0) ? 1 : (res < 0) ? -1 : 0;
+ if (curr === 0) {
+ continue;
+ } else if (prev && curr !== prev) {
+ return false;
+ }
+ prev = curr;
+ }
+ return true;
+ },
+
isArea: function() {
if (this.tags.area === 'yes')
return true;
beach: 'beach',
scrub: 'scrub',
construction: 'construction',
+ military: 'construction',
cemetery: 'cemetery',
grave_yard: 'cemetery',
meadow: 'meadow',
};
iD.svg.TagClasses = function() {
var primary = [
- 'highway', 'railway', 'waterway', 'aeroway', 'motorway',
- 'boundary', 'power', 'amenity', 'natural', 'landuse',
- 'building', 'leisure', 'place'
+ 'building', 'highway', 'railway', 'waterway', 'aeroway',
+ 'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
+ 'leisure', 'place'
],
secondary = [
- 'oneway', 'bridge', 'tunnel', 'construction'
+ 'oneway', 'bridge', 'tunnel', 'construction', 'embankment', 'cutting'
],
tagClassRe = /^tag-/,
tags = function(entity) { return entity.tags; };
['bottom', [0, 1]]],
opacityDefault = (context.storage('background-opacity') !== null) ?
(+context.storage('background-opacity')) : 0.5,
- customTemplate;
+ customTemplate = '';
// Can be 0 from <1.3.0 use or due to issue #1923.
if (opacityDefault === 0) opacityDefault = 0.5;
return field.present();
})
.each(function(field) {
- var reference = iD.ui.TagReference({key: field.key});
+ var reference = iD.ui.TagReference(field.reference || {key: field.key});
if (state === 'hover') {
reference.showing(false);
$fill.enter().append('div');
$fill.attr('class', function() {
- var s = 'preset-icon-fill icon-' + geom;
+ var s = 'preset-icon-fill preset-icon-fill-' + geom;
for (var i in p.tags) {
s += ' tag-' + i + ' tag-' + i + '-' + p.tags[i];
}
}
function keyChange(d) {
- var tag = {};
- tag[d.key] = undefined;
- tag[this.value] = d.value;
- d.key = this.value; // Maintain DOM identity through the subsequent update.
+ var kOld = d.key,
+ kNew = this.value.trim(),
+ tag = {};
+
+ if (kNew && kNew !== kOld) {
+ var match = kNew.match(/^(.*?)(?:_(\d+))?$/),
+ base = match[1],
+ suffix = +(match[2] || 1);
+ while (tags[kNew]) { // rename key if already in use
+ kNew = base + '_' + suffix++;
+ }
+ }
+ tag[kOld] = undefined;
+ tag[kNew] = d.value;
+ d.key = kNew; // Maintain DOM identity through the subsequent update.
+ this.value = kNew;
event.change(tag);
}
}
access.options = function(type) {
- var options = ['no', 'permissive', 'private', 'designated', 'destination'];
+ var options = ['no', 'permissive', 'private', 'destination'];
if (type !== 'access') {
options.unshift('yes');
+ options.push('designated');
}
return options.map(function(option) {
var placeholders = {
footway: {
- foot: 'yes',
+ foot: 'designated',
motor_vehicle: 'no'
},
steps: {
foot: 'yes',
- motor_vehicle: 'no'
+ motor_vehicle: 'no',
+ bicycle: 'no',
+ horse: 'no'
},
pedestrian: {
foot: 'yes',
motor_vehicle: 'no'
},
cycleway: {
- bicycle: 'yes',
- motor_vehicle: 'no'
+ motor_vehicle: 'no',
+ bicycle: 'designated'
},
bridleway: {
- horse: 'yes'
+ motor_vehicle: 'no',
+ horse: 'designated'
},
path: {
- motor_vehicle: 'no'
+ foot: 'yes',
+ motor_vehicle: 'no',
+ bicycle: 'yes',
+ horse: 'yes'
},
motorway: {
- motor_vehicle: 'yes'
+ foot: 'no',
+ motor_vehicle: 'yes',
+ bicycle: 'no',
+ horse: 'no'
},
trunk: {
motor_vehicle: 'yes'
},
primary: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
secondary: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
tertiary: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
residential: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
unclassified: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
service: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
motorway_link: {
- motor_vehicle: 'yes'
+ foot: 'no',
+ motor_vehicle: 'yes',
+ bicycle: 'no',
+ horse: 'no'
},
trunk_link: {
motor_vehicle: 'yes'
},
primary_link: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
secondary_link: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
},
tertiary_link: {
- motor_vehicle: 'yes'
+ foot: 'yes',
+ motor_vehicle: 'yes',
+ bicycle: 'yes',
+ horse: 'yes'
}
};
_.forEach(placeholders[tags.highway], function(value, key) {
items.selectAll('#preset-input-access-' + key)
- .attr('placeholder', value);
+ .attr('placeholder', function() {
+ return (tags.access && (value === 'yes' || value === 'designated')) ? tags.access : value;
+ });
});
};
return d3.rebind(address, event, 'on');
};
-iD.ui.preset.check = function(field) {
+iD.ui.preset.check =
+iD.ui.preset.defaultcheck = function(field) {
var event = d3.dispatch('change'),
- values = [undefined, 'yes', 'no'],
+ values = field.type === 'check' ?
+ [undefined, 'yes', 'no'] :
+ [undefined, 'yes'],
value,
box,
text,
.attr('class', 'preset-input-wrap');
enter.append('input')
- .property('indeterminate', true)
+ .property('indeterminate', field.type === 'check')
.attr('type', 'checkbox')
.attr('id', 'preset-input-' + field.id);
box = label.select('input')
.on('click', function() {
var t = {};
- t[field.key] = values[(values.indexOf(value) + 1) % 3];
+ t[field.key] = values[(values.indexOf(value) + 1) % values.length];
event.change(t);
d3.event.stopPropagation();
});
check.tags = function(tags) {
value = tags[field.key];
- box.property('indeterminate', !value);
+ box.property('indeterminate', field.type === 'check' && !value);
box.property('checked', value === 'yes');
- text.text(value ? t('inspector.check.' + value, {default: value}) : t('inspector.unknown'));
+ text.text(value ? t('inspector.check.' + value, {default: value}) :
+ field.type === 'check' ? t('inspector.unknown') : t('inspector.check.no'));
label.classed('set', !!value);
};
return d3.rebind(combo, event, 'on');
};
-iD.ui.preset.defaultcheck = function(field) {
- var event = d3.dispatch('change'),
- input;
-
- function check(selection) {
- input = selection.selectAll('input')
- .data([0]);
-
- input.enter().append('input')
- .attr('type', 'checkbox')
- .attr('id', 'preset-input-' + field.id);
-
- input
- .on('change', function() {
- var t = {};
- t[field.key] = input.property('checked') ? field.value || 'yes' : undefined;
- event.change(t);
- });
- }
-
- check.tags = function(tags) {
- input.property('checked', !!tags[field.key] && tags[field.key] !== 'no');
- };
-
- check.focus = function() {
- input.node().focus();
- };
-
- return d3.rebind(check, event, 'on');
-};
iD.ui.preset.text =
iD.ui.preset.number =
iD.ui.preset.tel =
"terms_url": "http://geo.nls.uk/maps/",
"terms_text": "National Library of Scotland Historic Maps"
},
+ {
+ "name": "Ireland British War Office 1:25k GSGS 3906",
+ "type": "tms",
+ "template": "http://mapwarper.net/layers/tile/101/{zoom}/{x}/{y}.png",
+ "scaleExtent": [
+ 0,
+ 18
+ ],
+ "polygon": [
+ [
+ [
+ -10.71,
+ 51.32
+ ],
+ [
+ -10.71,
+ 55.46
+ ],
+ [
+ -5.37,
+ 55.46
+ ],
+ [
+ -5.37,
+ 51.32
+ ],
+ [
+ -10.71,
+ 51.32
+ ]
+ ]
+ ],
+ "terms_url": "http://wiki.openstreetmap.org/wiki/WikiProject_Ireland#Trinity_College_Dublin",
+ "terms_text": "Glucksman Map Library, Trinity College Dublin",
+ "id": "GSGS3906"
+ },
{
"name": "Ireland British War Office One-Inch 1941-43 GSGS 4136",
"type": "tms",
]
],
"terms_url": "http://geo.nls.uk/maps/",
- "terms_text": "National Library of Scotland Historic Maps"
+ "terms_text": "National Library of Scotland Historic Maps",
+ "id": "GSGS4136"
},
{
"name": "Ireland EEA CORINE 2006",
],
"fields": [
"ref",
- "surface"
+ "surface",
+ "length",
+ "width"
],
"tags": {
"aeroway": "runway"
"name": "Car Sharing"
},
"amenity/car_wash": {
+ "icon": "car",
"geometry": [
"point",
"area"
],
"name": "Car Wash"
},
+ "amenity/charging_station": {
+ "icon": "car",
+ "geometry": [
+ "point",
+ "area"
+ ],
+ "tags": {
+ "amenity": "charging_station"
+ },
+ "fields": [
+ "operator"
+ ],
+ "terms": [
+ "EV",
+ "Electric Vehicle",
+ "Supercharger"
+ ],
+ "name": "Charging Station"
+ },
"amenity/childcare": {
"icon": "school",
"fields": [
"terms": [],
"name": "College"
},
+ "amenity/compressed_air": {
+ "icon": "car",
+ "geometry": [
+ "point",
+ "area"
+ ],
+ "tags": {
+ "amenity": "compressed_air"
+ },
+ "name": "Compressed Air"
+ },
"amenity/courthouse": {
"fields": [
"operator",
"terms": [],
"name": "Car Parking"
},
+ "amenity/parking_entrance": {
+ "icon": "entrance",
+ "geometry": [
+ "vertex"
+ ],
+ "tags": {
+ "amenity": "parking_entrance"
+ },
+ "fields": [
+ "access_simple",
+ "ref"
+ ],
+ "name": "Parking Garage Entrance/Exit"
+ },
"amenity/pharmacy": {
"icon": "pharmacy",
"fields": [
"fields": [
"building",
"levels",
- "address",
- "smoking"
+ "address"
],
"geometry": [
"area"
"tags": {
"building": "entrance"
},
- "name": "Entrance",
+ "name": "Entrance/Exit",
"searchable": false
},
"building/garage": {
"access_simple",
"address"
],
- "name": "Entrance"
+ "name": "Entrance/Exit"
},
"footway/crossing": {
"fields": [
"fields": [
"surface",
"lit",
+ "width",
+ "structure",
"access"
],
"geometry": [
"terms": [],
"name": "Sidewalk"
},
+ "ford": {
+ "geometry": [
+ "vertex"
+ ],
+ "tags": {
+ "ford": "yes"
+ },
+ "name": "Ford"
+ },
"golf/bunker": {
"icon": "golf",
"geometry": [
},
"highway/bridleway": {
"fields": [
- "access",
"surface",
- "structure"
+ "width",
+ "structure",
+ "access"
],
"icon": "highway-bridleway",
"geometry": [
},
"highway/crossing": {
"fields": [
- "crossing"
+ "crossing",
+ "sloped_curb",
+ "tactile_paving"
],
"geometry": [
"vertex"
"fields": [
"surface",
"lit",
+ "width",
+ "oneway",
"structure",
- "access",
- "oneway"
+ "access"
],
"geometry": [
"line"
"highway/footway": {
"icon": "highway-footway",
"fields": [
+ "surface",
+ "lit",
+ "width",
"structure",
- "access",
- "surface"
+ "access"
],
"geometry": [
"line",
"highway/path": {
"icon": "highway-path",
"fields": [
+ "surface",
+ "width",
"structure",
"access",
"sac_scale",
- "surface",
"incline",
"trail_visibility",
"ref"
},
"highway/pedestrian": {
"fields": [
- "access",
+ "surface",
+ "lit",
+ "width",
"oneway",
- "surface"
+ "structure",
+ "access"
],
"geometry": [
"line",
},
"highway/steps": {
"fields": [
- "access",
- "surface"
+ "surface",
+ "lit",
+ "width",
+ "access"
],
"icon": "highway-steps",
"geometry": [
"terms": [],
"name": "Cemetery"
},
+ "landuse/churchyard": {
+ "fields": [
+ "religion",
+ "denomination"
+ ],
+ "geometry": [
+ "area"
+ ],
+ "tags": {
+ "landuse": "churchyard"
+ },
+ "terms": [],
+ "name": "Churchyard"
+ },
"landuse/commercial": {
+ "icon": "commercial",
"geometry": [
"point",
"area"
"terms": [],
"name": "Meadow"
},
+ "landuse/military": {
+ "geometry": [
+ "area"
+ ],
+ "tags": {
+ "landuse": "military"
+ },
+ "terms": [],
+ "name": "Military"
+ },
"landuse/orchard": {
"fields": [
"trees"
"name": "Quarry"
},
"landuse/residential": {
+ "icon": "building",
"geometry": [
"point",
"area"
"icon": "pitch",
"fields": [
"sport",
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
"leisure/pitch/american_football": {
"icon": "america-football",
"fields": [
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
},
"leisure/pitch/baseball": {
"icon": "baseball",
+ "fields": [
+ "lit"
+ ],
"geometry": [
"point",
"area"
"icon": "basketball",
"fields": [
"surface",
- "hoops"
+ "hoops",
+ "lit"
],
"geometry": [
"point",
"leisure/pitch/skateboard": {
"icon": "pitch",
"fields": [
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
"leisure/pitch/soccer": {
"icon": "soccer",
"fields": [
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
"leisure/pitch/tennis": {
"icon": "tennis",
"fields": [
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
"leisure/pitch/volleyball": {
"icon": "pitch",
"fields": [
- "surface"
+ "surface",
+ "lit"
],
"geometry": [
"point",
"leisure/track": {
"icon": "pitch",
"fields": [
- "surface"
+ "surface",
+ "lit",
+ "width"
],
"geometry": [
"point",
},
"place/city": {
"icon": "city",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/hamlet": {
"icon": "triangle-stroked",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/locality": {
"icon": "marker",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/neighbourhood": {
"icon": "triangle-stroked",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/suburb": {
"icon": "triangle-stroked",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/town": {
"icon": "town",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
},
"place/village": {
"icon": "village",
+ "fields": [
+ "population"
+ ],
"geometry": [
"point",
"area"
"name": "Car Dealership"
},
"shop/car_parts": {
- "icon": "shop",
+ "icon": "car",
"fields": [
"address",
"building_area",
"name": "Car Parts Store"
},
"shop/car_repair": {
- "icon": "shop",
+ "icon": "car",
"fields": [
"address",
"building_area",
"name": "Car Repair Shop"
},
"shop/chemist": {
- "icon": "shop",
+ "icon": "chemist",
"fields": [
"address",
"building_area",
"name": "Greengrocer"
},
"shop/hairdresser": {
- "icon": "shop",
+ "icon": "hairdresser",
"fields": [
"address",
"building_area",
"name": "Mall"
},
"shop/mobile_phone": {
- "icon": "shop",
+ "icon": "mobilephone",
"fields": [
"address",
"building_area",
"name": "Mobile Phone Store"
},
"shop/motorcycle": {
- "icon": "shop",
+ "icon": "scooter",
"fields": [
"address",
"building_area",
},
"name": "Video Store"
},
+ "shop/wine": {
+ "icon": "alcohol-shop",
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "tags": {
+ "shop": "wine"
+ },
+ "terms": [
+ "winery"
+ ],
+ "name": "Wine Shop"
+ },
"tourism": {
"fields": [
"tourism"
},
"waterway/canal": {
"icon": "waterway-canal",
+ "fields": [
+ "width"
+ ],
"geometry": [
"line"
],
"waterway/river": {
"icon": "waterway-river",
"fields": [
- "tunnel"
+ "tunnel",
+ "width"
],
"geometry": [
"line"
"waterway/stream": {
"icon": "waterway-stream",
"fields": [
- "tunnel"
+ "tunnel",
+ "width"
],
"geometry": [
"line"
"shop": "chemist"
},
"name": "Müller",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Schlecker",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Etos",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Bipa",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Rossmann",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "DM Drogeriemarkt",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Ihr Platz",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Douglas",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "chemist"
},
"name": "Kruidvat",
- "icon": "shop",
+ "icon": "chemist",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Peugeot",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Kwik Fit",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "ATU",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Kwik-Fit",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Midas",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Feu Vert",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Norauto",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Speedy",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Автозапчасти",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Renault",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Pit Stop",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Jiffy Lube",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Шиномонтаж",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "СТО",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "O'Reilly Auto Parts",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Carglass",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "шиномонтаж",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Citroen",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Euromaster",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Firestone",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "AutoZone",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Автосервис",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Advance Auto Parts",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
"shop": "car_repair"
},
"name": "Roady",
- "icon": "shop",
+ "icon": "car",
"geometry": [
"point",
"vertex",
],
"suggestion": true
},
- "shop/car/Ford": {
- "tags": {
- "name": "Ford",
- "shop": "car"
- },
- "name": "Ford",
- "icon": "car",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "opening_hours"
- ],
- "suggestion": true
- },
"shop/car/Volkswagen": {
"tags": {
"name": "Volkswagen",
"shop": "mobile_phone"
},
"name": "Билайн",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "ソフトバンクショップ (SoftBank shop)",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Vodafone",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "O2",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Carphone Warehouse",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Orange",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Verizon Wireless",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Sprint",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "T-Mobile",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "МТС",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Евросеть",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Bell",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "The Phone House",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "SFR",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Связной",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Мегафон",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "AT&T",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "ドコモショップ (docomo shop)",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "au",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Movistar",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "mobile_phone"
},
"name": "Bitė",
- "icon": "shop",
+ "icon": "mobilephone",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Klier",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Supercuts",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Hairkiller",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Great Clips",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Парикмахерская",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Стиль",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Fryzjer",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Franck Provost",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "hairdresser"
},
"name": "Салон красоты",
- "icon": "shop",
+ "icon": "hairdresser",
"geometry": [
"point",
"vertex",
"shop": "motorcycle"
},
"name": "Yamaha",
- "icon": "shop",
+ "icon": "scooter",
"geometry": [
"point",
"vertex",
"landuse/farmyard",
"landuse/forest",
"landuse/meadow",
- "landuse/cemetery"
+ "landuse/cemetery",
+ "landuse/military"
]
},
"category-path": {
"bicycle",
"horse"
],
+ "reference": {
+ "key": "access"
+ },
"type": "access",
"label": "Access",
"placeholder": "Unknown",
"addr:city",
"addr:postcode"
],
+ "reference": {
+ "key": "addr"
+ },
"icon": "address",
"universal": true,
"label": "Address",
},
"building_area": {
"key": "building",
- "type": "check",
+ "type": "defaultcheck",
"default": "yes",
"geometry": "area",
"label": "Building"
"type": "combo",
"label": "Fuel"
},
+ "fuel/biodiesel": {
+ "key": "fuel:biodiesel",
+ "type": "check",
+ "label": "Sells Biodiesel"
+ },
+ "fuel/diesel": {
+ "key": "fuel:diesel",
+ "type": "check",
+ "label": "Sells Diesel"
+ },
+ "fuel/e10": {
+ "key": "fuel:e10",
+ "type": "check",
+ "label": "Sells E10"
+ },
+ "fuel/e85": {
+ "key": "fuel:e85",
+ "type": "check",
+ "label": "Sells E85"
+ },
+ "fuel/lpg": {
+ "key": "fuel:lpg",
+ "type": "check",
+ "label": "Sells Propane"
+ },
+ "fuel/octane_100": {
+ "key": "fuel:octane_100",
+ "type": "check",
+ "label": "Sells Racing Gasoline"
+ },
+ "fuel/octane_91": {
+ "key": "fuel:octane_91",
+ "type": "check",
+ "label": "Sells Regular Gasoline"
+ },
+ "fuel/octane_95": {
+ "key": "fuel:octane_95",
+ "type": "check",
+ "label": "Sells Midgrade Gasoline"
+ },
+ "fuel/octane_98": {
+ "key": "fuel:octane_98",
+ "type": "check",
+ "label": "Sells Premium Gasoline"
+ },
"gauge": {
"key": "gauge",
"type": "combo",
"type": "typeCombo",
"label": "Type"
},
+ "length": {
+ "key": "length",
+ "type": "number",
+ "label": "Length (Meters)"
+ },
"levels": {
"key": "building:levels",
"type": "number",
"type": "typeCombo",
"label": "Type"
},
+ "population": {
+ "key": "population",
+ "type": "text",
+ "label": "Population"
+ },
"power": {
"key": "power",
"type": "typeCombo",
"type": "typeCombo",
"label": "Type"
},
+ "sloped_curb": {
+ "key": "sloped_curb",
+ "type": "combo",
+ "label": "Sloped Curb"
+ },
"smoking": {
"key": "smoking",
"type": "combo",
"bridge",
"tunnel",
"embankment",
- "cutting"
+ "cutting",
+ "ford"
],
"label": "Structure",
"placeholder": "Unknown",
"bridge": "Bridge",
"tunnel": "Tunnel",
"embankment": "Embankment",
- "cutting": "Cutting"
+ "cutting": "Cutting",
+ "ford": "Ford"
}
}
},
"type": "combo",
"label": "Surface"
},
+ "tactile_paving": {
+ "key": "tactile_paving",
+ "type": "check",
+ "label": "Tactile Paving"
+ },
"toilets/disposal": {
"key": "toilets:disposal",
"type": "combo",
"universal": true,
"label": "Wheelchair Access"
},
+ "width": {
+ "key": "width",
+ "type": "number",
+ "label": "Width (Meters)"
+ },
"wikipedia": {
"key": "wikipedia",
"type": "wikipedia",
504
]
},
+ "hairdresser": {
+ "12": [
+ 42,
+ 528
+ ],
+ "18": [
+ 24,
+ 528
+ ],
+ "24": [
+ 0,
+ 528
+ ]
+ },
+ "chemist": {
+ "12": [
+ 96,
+ 528
+ ],
+ "18": [
+ 78,
+ 528
+ ],
+ "24": [
+ 54,
+ 528
+ ]
+ },
+ "mobilephone": {
+ "12": [
+ 150,
+ 528
+ ],
+ "18": [
+ 132,
+ 528
+ ],
+ "24": [
+ 108,
+ 528
+ ]
+ },
+ "scooter": {
+ "12": [
+ 204,
+ 528
+ ],
+ "18": [
+ 186,
+ 528
+ ],
+ "24": [
+ 162,
+ 528
+ ]
+ },
"highway-motorway": {
"line": [
20,
"nl",
"en-GB",
"et",
- "fil",
"fi",
"fr",
"gl",
"sl",
"es",
"sv",
+ "tl",
"ta",
"te",
"tr",
"fuel": {
"label": "Fuel"
},
+ "fuel/biodiesel": {
+ "label": "Sells Biodiesel"
+ },
+ "fuel/diesel": {
+ "label": "Sells Diesel"
+ },
+ "fuel/e10": {
+ "label": "Sells E10"
+ },
+ "fuel/e85": {
+ "label": "Sells E85"
+ },
+ "fuel/lpg": {
+ "label": "Sells Propane"
+ },
+ "fuel/octane_100": {
+ "label": "Sells Racing Gasoline"
+ },
+ "fuel/octane_91": {
+ "label": "Sells Regular Gasoline"
+ },
+ "fuel/octane_95": {
+ "label": "Sells Midgrade Gasoline"
+ },
+ "fuel/octane_98": {
+ "label": "Sells Premium Gasoline"
+ },
"gauge": {
"label": "Gauge"
},
"leisure": {
"label": "Type"
},
+ "length": {
+ "label": "Length (Meters)"
+ },
"levels": {
"label": "Levels",
"placeholder": "2, 4, 6..."
"place": {
"label": "Type"
},
+ "population": {
+ "label": "Population"
+ },
"power": {
"label": "Type"
},
"shop": {
"label": "Type"
},
+ "sloped_curb": {
+ "label": "Sloped Curb"
+ },
"smoking": {
"label": "Smoking"
},
"bridge": "Bridge",
"tunnel": "Tunnel",
"embankment": "Embankment",
- "cutting": "Cutting"
+ "cutting": "Cutting",
+ "ford": "Ford"
}
},
"studio_type": {
"surface": {
"label": "Surface"
},
+ "tactile_paving": {
+ "label": "Tactile Paving"
+ },
"toilets/disposal": {
"label": "Disposal"
},
"wheelchair": {
"label": "Wheelchair Access"
},
+ "width": {
+ "label": "Width (Meters)"
+ },
"wikipedia": {
"label": "Wikipedia"
},
"name": "Car Wash",
"terms": ""
},
+ "amenity/charging_station": {
+ "name": "Charging Station",
+ "terms": "EV,Electric Vehicle,Supercharger"
+ },
"amenity/childcare": {
"name": "Childcare",
"terms": "nursery,orphanage,playgroup"
"name": "College",
"terms": ""
},
+ "amenity/compressed_air": {
+ "name": "Compressed Air",
+ "terms": ""
+ },
"amenity/courthouse": {
"name": "Courthouse",
"terms": ""
"name": "Car Parking",
"terms": ""
},
+ "amenity/parking_entrance": {
+ "name": "Parking Garage Entrance/Exit",
+ "terms": ""
+ },
"amenity/pharmacy": {
"name": "Pharmacy",
"terms": ""
"terms": ""
},
"building/entrance": {
- "name": "Entrance",
+ "name": "Entrance/Exit",
"terms": ""
},
"building/garage": {
"terms": ""
},
"entrance": {
- "name": "Entrance",
+ "name": "Entrance/Exit",
"terms": ""
},
"footway/crossing": {
"name": "Sidewalk",
"terms": ""
},
+ "ford": {
+ "name": "Ford",
+ "terms": ""
+ },
"golf/bunker": {
"name": "Sand Trap",
"terms": "hazard,bunker"
"name": "Cemetery",
"terms": ""
},
+ "landuse/churchyard": {
+ "name": "Churchyard",
+ "terms": ""
+ },
"landuse/commercial": {
"name": "Commercial",
"terms": ""
"name": "Meadow",
"terms": ""
},
+ "landuse/military": {
+ "name": "Military",
+ "terms": ""
+ },
"landuse/orchard": {
"name": "Orchard",
"terms": ""
"name": "Video Store",
"terms": ""
},
+ "shop/wine": {
+ "name": "Wine Shop",
+ "terms": "winery"
+ },
"tourism": {
"name": "Tourism",
"terms": ""
projects / rails.git / blobdiff