}
})(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 = [],
/**
* @license
* Lo-Dash 2.3.0 (Custom Build) <http://lodash.com/>
- * Build: `lodash include="any,assign,bind,clone,compact,contains,debounce,difference,each,every,extend,filter,find,first,forEach,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,pairs,pluck,reject,some,throttle,union,uniq,unique,values,without,flatten,value,chain,cloneDeep,merge" exports="global,node"`
+ * Build: `lodash --debug --output js/lib/lodash.js include="any,assign,bind,clone,compact,contains,debounce,difference,each,every,extend,filter,find,first,forEach,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,pairs,pluck,reject,some,throttle,union,uniq,unique,values,without,flatten,value,chain,cloneDeep,merge,pick" exports="global,node"`
* Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
* Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
* Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
return result;
}
+ /**
+ * Creates a shallow clone of `object` composed of the specified properties.
+ * Property names may be specified as individual arguments or as arrays of
+ * property names. If a callback is provided it will be executed for each
+ * property of `object` picking the properties the callback returns truey
+ * for. The callback is bound to `thisArg` and invoked with three arguments;
+ * (value, key, object).
+ *
+ * @static
+ * @memberOf _
+ * @category Objects
+ * @param {Object} object The source object.
+ * @param {Function|...string|string[]} [callback] The function called per
+ * iteration or property names to pick, specified as individual property
+ * names or arrays of property names.
+ * @param {*} [thisArg] The `this` binding of `callback`.
+ * @returns {Object} Returns an object composed of the picked properties.
+ * @example
+ *
+ * _.pick({ 'name': 'fred', '_userid': 'fred1' }, 'name');
+ * // => { 'name': 'fred' }
+ *
+ * _.pick({ 'name': 'fred', '_userid': 'fred1' }, function(value, key) {
+ * return key.charAt(0) != '_';
+ * });
+ * // => { 'name': 'fred' }
+ */
+ function pick(object, callback, thisArg) {
+ var result = {};
+ if (typeof callback != 'function') {
+ var index = -1,
+ props = baseFlatten(arguments, true, false, 1),
+ length = isObject(object) ? props.length : 0;
+
+ while (++index < length) {
+ var key = props[index];
+ if (key in object) {
+ result[key] = object[key];
+ }
+ }
+ } else {
+ callback = lodash.createCallback(callback, thisArg, 3);
+ forIn(object, function(value, key, object) {
+ if (callback(value, key, object)) {
+ result[key] = value;
+ }
+ });
+ }
+ return result;
+ }
+
/**
* Creates an array composed of the own enumerable property values of `object`.
*
lodash.merge = merge;
lodash.omit = omit;
lodash.pairs = pairs;
+ lodash.pick = pick;
lodash.pluck = pluck;
lodash.reject = reject;
lodash.throttle = throttle;
};
/* Projection */
- function rawMercator() {
- var project = d3.geo.mercator.raw,
- k = 512 / Math.PI, // scale
- x = 0, y = 0, // translate
- clipExtent = [[0, 0], [0, 0]];
-
- function projection(point) {
- point = project(point[0] * Math.PI / 180, point[1] * Math.PI / 180);
- return [point[0] * k + x, y - point[1] * k];
- }
-
- projection.invert = function(point) {
- point = project.invert((point[0] - x) / k, (y - point[1]) / k);
- return point && [point[0] * 180 / Math.PI, point[1] * 180 / Math.PI];
- };
-
- projection.scale = function(_) {
- if (!arguments.length) return k;
- k = +_;
- return projection;
- };
-
- projection.translate = function(_) {
- if (!arguments.length) return [x, y];
- x = +_[0];
- y = +_[1];
- return projection;
- };
-
- projection.clipExtent = function(_) {
- if (!arguments.length) return clipExtent;
- clipExtent = _;
- return projection;
- };
-
- projection.stream = d3.geo.transform({
- point: function(x, y) {
- x = projection([x, y]);
- this.stream.point(x[0], x[1]);
- }
- }).stream;
-
- return projection;
- }
-
- context.projection = rawMercator();
+ context.projection = iD.geo.RawMercator();
/* Background */
var background = iD.Background(context);
return d3.rebind(context, dispatch, 'on');
};
-iD.version = '1.3.9';
+iD.version = '1.4.0';
(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];
(a[0] === b[1] && a[1] === b[0]);
};
+// Return the counterclockwise angle in the range (-pi, pi)
+// between the positive X axis and the line intersecting a and b.
+iD.geo.angle = function(a, b, projection) {
+ a = projection(a.loc);
+ b = projection(b.loc);
+ return Math.atan2(b[1] - a[1], b[0] - a[0]);
+};
+
// Choose the edge with the minimal distance from `point` to its orthogonal
// projection onto that edge, if such a projection exists, or the distance to
// the closest vertex on that edge. Returns an object with the `index` of the
return [this[0][0], this[0][1], this[1][0], this[1][1]].join(',');
}
});
+iD.geo.Turn = function(turn) {
+ if (!(this instanceof iD.geo.Turn))
+ return new iD.geo.Turn(turn);
+ _.extend(this, turn);
+};
+
+iD.geo.Intersection = function(graph, vertexId) {
+ var vertex = graph.entity(vertexId),
+ highways = [];
+
+ // Pre-split ways that would need to be split in
+ // order to add a restriction. The real split will
+ // happen when the restriction is added.
+ graph.parentWays(vertex).forEach(function(way) {
+ if (!way.tags.highway || way.isArea() || way.isDegenerate())
+ return;
+
+ if (way.affix(vertexId)) {
+ highways.push(way);
+ } else {
+ var idx = _.indexOf(way.nodes, vertex.id, 1),
+ wayA = iD.Way({id: way.id + '-a', tags: way.tags, nodes: way.nodes.slice(0, idx + 1)}),
+ wayB = iD.Way({id: way.id + '-b', tags: way.tags, nodes: way.nodes.slice(idx)});
+
+ graph = graph.replace(wayA);
+ graph = graph.replace(wayB);
+
+ highways.push(wayA);
+ highways.push(wayB);
+ }
+ });
+
+ var intersection = {
+ highways: highways,
+ graph: graph
+ };
+
+ intersection.turns = function(fromNodeID) {
+ if (!fromNodeID)
+ return [];
+
+ var way = _.find(highways, function(way) { return way.contains(fromNodeID); });
+ if (way.first() === vertex.id && way.tags.oneway === 'yes')
+ return [];
+ if (way.last() === vertex.id && way.tags.oneway === '-1')
+ return [];
+
+ function withRestriction(turn) {
+ graph.parentRelations(graph.entity(turn.from.way)).forEach(function(relation) {
+ if (relation.tags.type !== 'restriction')
+ return;
+
+ var f = relation.memberByRole('from'),
+ t = relation.memberByRole('to'),
+ v = relation.memberByRole('via');
+
+ if (f && f.id === turn.from.way &&
+ v && v.id === turn.via.node &&
+ t && t.id === turn.to.way) {
+ turn.restriction = relation.id;
+ } else if (/^only_/.test(relation.tags.restriction) &&
+ f && f.id === turn.from.way &&
+ v && v.id === turn.via.node &&
+ t && t.id !== turn.to.way) {
+ turn.restriction = relation.id;
+ turn.indirect_restriction = true;
+ }
+ });
+
+ return iD.geo.Turn(turn);
+ }
+
+ var from = {
+ node: way.nodes[way.first() === vertex.id ? 1 : way.nodes.length - 2],
+ way: way.id.split(/-(a|b)/)[0]
+ },
+ via = {node: vertex.id},
+ turns = [];
+
+ highways.forEach(function(parent) {
+ if (parent === way)
+ return;
+
+ var index = parent.nodes.indexOf(vertex.id);
+
+ // backward
+ if (parent.first() !== vertex.id && parent.tags.oneway !== 'yes') {
+ turns.push(withRestriction({
+ from: from,
+ via: via,
+ to: {node: parent.nodes[index - 1], way: parent.id.split(/-(a|b)/)[0]}
+ }));
+ }
+
+ // forward
+ if (parent.last() !== vertex.id && parent.tags.oneway !== '-1') {
+ turns.push(withRestriction({
+ from: from,
+ via: via,
+ to: {node: parent.nodes[index + 1], way: parent.id.split(/-(a|b)/)[0]}
+ }));
+ }
+ });
+
+ // U-turn
+ if (way.tags.oneway !== 'yes' && way.tags.oneway !== '-1') {
+ turns.push(withRestriction({
+ from: from,
+ via: via,
+ to: from,
+ u: true
+ }));
+ }
+
+ return turns;
+ };
+
+ return intersection;
+};
+
+iD.geo.inferRestriction = function(from, via, to, projection) {
+ var angle = iD.geo.angle(via, from, projection) -
+ iD.geo.angle(via, to, projection);
+
+ angle = angle * 180 / Math.PI;
+
+ while (angle < 0)
+ angle += 360;
+
+ if (angle < 23)
+ return 'no_u_turn';
+ if (angle < 158)
+ return 'no_right_turn';
+ if (angle < 202)
+ return 'no_straight_on';
+ if (angle < 336)
+ return 'no_left_turn';
+
+ return 'no_u_turn';
+};
// For fixing up rendering of multipolygons with tags on the outer member.
// https://github.com/openstreetmap/iD/issues/613
iD.geo.isSimpleMultipolygonOuterMember = function(entity, graph) {
return joined;
};
-iD.geo.turns = function(graph, entityID) {
- var way = graph.entity(entityID);
- if (way.type !== 'way' || !way.tags.highway || way.isArea())
- return [];
-
- function withRestriction(turn) {
- graph.parentRelations(turn.from).forEach(function(relation) {
- if (relation.tags.type !== 'restriction')
- return;
-
- var f = relation.memberByRole('from'),
- t = relation.memberByRole('to'),
- v = relation.memberByRole('via');
-
- if (f && f.id === turn.from.id &&
- t && t.id === turn.to.id &&
- v && v.id === turn.via.id) {
- turn.restriction = relation;
- }
- });
+/*
+ Bypasses features of D3's default projection stream pipeline that are unnecessary:
+ * Antimeridian clipping
+ * Spherical rotation
+ * Resampling
+*/
+iD.geo.RawMercator = function () {
+ var project = d3.geo.mercator.raw,
+ k = 512 / Math.PI, // scale
+ x = 0, y = 0, // translate
+ clipExtent = [[0, 0], [0, 0]];
- return turn;
+ function projection(point) {
+ point = project(point[0] * Math.PI / 180, point[1] * Math.PI / 180);
+ return [point[0] * k + x, y - point[1] * k];
}
- var turns = [];
+ projection.invert = function(point) {
+ point = project.invert((point[0] - x) / k, (y - point[1]) / k);
+ return point && [point[0] * 180 / Math.PI, point[1] * 180 / Math.PI];
+ };
- [way.first(), way.last()].forEach(function(nodeID) {
- var node = graph.entity(nodeID);
- graph.parentWays(node).forEach(function(parent) {
- if (parent === way || parent.isDegenerate() || !parent.tags.highway)
- return;
- if (way.first() === node.id && way.tags.oneway === 'yes')
- return;
- if (way.last() === node.id && way.tags.oneway === '-1')
- return;
+ projection.scale = function(_) {
+ if (!arguments.length) return k;
+ k = +_;
+ return projection;
+ };
- var index = parent.nodes.indexOf(node.id);
+ projection.translate = function(_) {
+ if (!arguments.length) return [x, y];
+ x = +_[0];
+ y = +_[1];
+ return projection;
+ };
- // backward
- if (parent.first() !== node.id && parent.tags.oneway !== 'yes') {
- turns.push(withRestriction({
- from: way,
- to: parent,
- via: node,
- toward: graph.entity(parent.nodes[index - 1])
- }));
- }
+ projection.clipExtent = function(_) {
+ if (!arguments.length) return clipExtent;
+ clipExtent = _;
+ return projection;
+ };
- // forward
- if (parent.last() !== node.id && parent.tags.oneway !== '-1') {
- turns.push(withRestriction({
- from: way,
- to: parent,
- via: node,
- toward: graph.entity(parent.nodes[index + 1])
- }));
- }
- });
- });
+ projection.stream = d3.geo.transform({
+ point: function(x, y) {
+ x = projection([x, y]);
+ this.stream.point(x[0], x[1]);
+ }
+ }).stream;
- return turns;
+ return projection;
};
iD.actions = {};
iD.actions.AddEntity = function(way) {
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';
return action;
};
+// Create a restriction relation for `turn`, which must have the following structure:
+//
+// {
+// from: { node: <node ID>, way: <way ID> },
+// via: { node: <node ID> },
+// to: { node: <node ID>, way: <way ID> },
+// restriction: <'no_right_turn', 'no_left_turn', etc.>
+// }
+//
+// This specifies a restriction of type `restriction` when traveling from
+// `from.node` in `from.way` toward `to.node` in `to.way` via `via.node`.
+// (The action does not check that these entities form a valid intersection.)
+//
+// If `restriction` is not provided, it is automatically determined by the
+// angle of the turn:
+//
+// 0-23 degrees: no_u_turn
+// 23-158 degrees: no_right_turn
+// 158-202 degrees: no_straight_on
+// 202-326 degrees: no_left_turn
+// 336-360 degrees: no_u_turn
+//
+// If necessary, the `from` and `to` ways are split. In these cases, `from.node`
+// and `to.node` are used to determine which portion of the split ways become
+// members of the restriction.
+//
+// For testing convenience, accepts an ID to assign to the new relation.
+// Normally, this will be undefined and the relation will automatically
+// be assigned a new ID.
+//
+iD.actions.RestrictTurn = function(turn, projection, restrictionId) {
+ return function(graph) {
+ var from = graph.entity(turn.from.way),
+ via = graph.entity(turn.via.node),
+ to = graph.entity(turn.to.way);
+
+ function split(toOrFrom) {
+ var newID = toOrFrom.newID || iD.Way().id;
+ graph = iD.actions.Split(via.id, [newID])
+ .limitWays([toOrFrom.way])(graph);
+
+ var a = graph.entity(newID),
+ b = graph.entity(toOrFrom.way);
+
+ if (a.nodes.indexOf(toOrFrom.node) !== -1) {
+ return [a, b];
+ } else {
+ return [b, a];
+ }
+ }
+
+ if (!from.affix(via.id)) {
+ if (turn.from.node === turn.to.node) {
+ // U-turn
+ from = to = split(turn.from)[0];
+ } else if (turn.from.way === turn.to.way) {
+ // Straight-on
+ var s = split(turn.from);
+ from = s[0];
+ to = s[1];
+ } else {
+ // Other
+ from = split(turn.from)[0];
+ }
+ }
+
+ if (!to.affix(via.id)) {
+ to = split(turn.to)[0];
+ }
+
+ return graph.replace(iD.Relation({
+ id: restrictionId,
+ tags: {
+ type: 'restriction',
+ restriction: turn.restriction ||
+ iD.geo.inferRestriction(
+ graph.entity(turn.from.node),
+ via,
+ graph.entity(turn.to.node),
+ projection)
+ },
+ members: [
+ {id: from.id, type: 'way', role: 'from'},
+ {id: via.id, type: 'node', role: 'via'},
+ {id: to.id, type: 'way', role: 'to'}
+ ]
+ }));
+ };
+};
/*
Order the nodes of a way in reverse order and reverse any direction dependent tags
other than `oneway`. (We assume that correcting a backwards oneway is the primary
return action;
};
+// Remove the effects of `turn.restriction` on `turn`, which must have the
+// following structure:
+//
+// {
+// from: { node: <node ID>, way: <way ID> },
+// via: { node: <node ID> },
+// to: { node: <node ID>, way: <way ID> },
+// restriction: <relation ID>
+// }
+//
+// In the simple case, `restriction` is a reference to a `no_*` restriction
+// on the turn itself. In this case, it is simply deleted.
+//
+// The more complex case is where `restriction` references an `only_*`
+// restriction on a different turn in the same intersection. In that case,
+// that restriction is also deleted, but at the same time restrictions on
+// the turns other than the first two are created.
+//
+iD.actions.UnrestrictTurn = function(turn) {
+ return function(graph) {
+ return iD.actions.DeleteRelation(turn.restriction)(graph);
+ };
+};
iD.behavior = {};
iD.behavior.AddWay = function(context) {
var event = d3.dispatch('start', 'startFromWay', 'startFromNode'),
.on('mouseup.lasso', mouseup);
d3.event.stopPropagation();
- d3.event.preventDefault();
-
}
}
};
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() {
}
}
- context.perform(
- action,
- annotation);
-
if (nextSelectedID && context.hasEntity(nextSelectedID)) {
context.enter(iD.modes.Select(context, [nextSelectedID]));
} else {
context.enter(iD.modes.Browse(context));
}
+
+ context.perform(
+ action,
+ annotation);
};
operation.available = function() {
"bench": true,
"clock": true,
"drinking_water": true,
+ "parking_entrance": true,
"post_box": true,
"telephone": true,
"vending_machine": true,
connection.changesetTags = function(comment, imageryUsed) {
var tags = {
- imagery_used: imageryUsed.join(';'),
+ imagery_used: imageryUsed.join(';').substr(0, 255),
created_by: 'iD ' + iD.version
};
});
},
+ isHighwayIntersection: function() {
+ return false;
+ },
+
deprecatedTags: function() {
var tags = _.pairs(this.tags);
var deprecated = {};
});
},
+ isHighwayIntersection: function(resolver) {
+ return resolver.transient(this, 'isHighwayIntersection', function() {
+ return resolver.parentWays(this).filter(function(parent) {
+ return parent.tags.highway && parent.geometry(resolver) === 'line';
+ }).length > 1;
+ });
+ },
+
asJXON: function(changeset_id) {
var r = {
node: {
};
}
});
+iD.oneWayTags = {
+ 'aerialway': {
+ 'chair_lift': true,
+ 'mixed_lift': true,
+ 't-bar': true,
+ 'j-bar': true,
+ 'platter': true,
+ 'rope_tow': true,
+ 'magic_carpet': true,
+ 'yes': true
+ },
+ 'highway': {
+ 'motorway': true,
+ 'motorway_link': true
+ },
+ 'junction': {
+ 'roundabout': true
+ },
+ 'man_made': {
+ 'piste:halfpipe': true,
+ 'pipeline': true
+ },
+ 'piste:type': {
+ 'downhill': true,
+ 'sled': true,
+ 'yes': true
+ },
+ 'waterway': {
+ 'river': true,
+ 'stream': true
+ }
+};
iD.Relation = iD.Entity.relation = function iD_Relation() {
if (!(this instanceof iD_Relation)) {
return (new iD_Relation()).initialize(arguments);
},
isOneWay: function() {
- return this.tags.oneway === 'yes' ||
- this.tags.oneway === '1' ||
- this.tags.oneway === '-1' ||
- this.tags.waterway === 'river' ||
- this.tags.waterway === 'stream' ||
- this.tags.junction === 'roundabout';
+ // 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..
+ for (var key in this.tags) {
+ if (key in iD.oneWayTags && (this.tags[key] in iD.oneWayTags[key]))
+ return true;
+ }
+ return false;
},
isClosed: function() {
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;
if (difference) {
var complete = difference.complete(map.extent());
all = _.compact(_.values(complete));
- filter = function(d) {
- if (d.type === 'midpoint') {
-
- var a = d.edge[0],
- b = d.edge[1];
-
- // redraw a midpoint if it needs to be
- // - moved (either edge node moved)
- // - deleted (edge nodes not consecutive in any parent way)
- if (a in complete || b in complete) return true;
-
- var parentsWays = graph.parentWays({ id: a });
- for (var i = 0; i < parentsWays.length; i++) {
- var nodes = parentsWays[i].nodes;
- for (var n = 0; n < nodes.length; n++) {
- if (nodes[n] === a && (nodes[n - 1] === b || nodes[n + 1] === b)) return false;
- }
- }
- return true;
-
- } else {
- return d.id in complete;
- }
- };
+ filter = function(d) { return d.id in complete; };
} else if (extent) {
all = context.intersects(map.extent().intersection(extent));
beach: 'beach',
scrub: 'scrub',
construction: 'construction',
+ military: 'construction',
cemetery: 'cemetery',
grave_yard: 'cemetery',
meadow: 'meadow',
.attr('d', path);
};
};
+/*
+ A standalone SVG element that contains only a `defs` sub-element. To be
+ used once globally, since defs IDs must be unique within a document.
+*/
+iD.svg.Defs = function(context) {
+ function autosize(image) {
+ var img = document.createElement('img');
+ img.src = image.attr('xlink:href');
+ img.onload = function() {
+ image.attr({
+ width: img.width,
+ height: img.height
+ });
+ };
+ }
+
+ function SpriteDefinition(id, href, data) {
+ return function(defs) {
+ defs.append('image')
+ .attr('id', id)
+ .attr('xlink:href', href)
+ .call(autosize);
+
+ defs.selectAll()
+ .data(data)
+ .enter().append('use')
+ .attr('id', function(d) { return d.key; })
+ .attr('transform', function(d) { return 'translate(-' + d.value[0] + ',-' + d.value[1] + ')'; })
+ .attr('xlink:href', '#' + id);
+ };
+ }
+
+ return function (selection) {
+ var defs = selection.append('defs');
+
+ defs.append('marker')
+ .attr({
+ id: 'oneway-marker',
+ viewBox: '0 0 10 10',
+ refY: 2.5,
+ refX: 5,
+ markerWidth: 2,
+ markerHeight: 2,
+ orient: 'auto'
+ })
+ .append('path')
+ .attr('d', 'M 5 3 L 0 3 L 0 2 L 5 2 L 5 0 L 10 2.5 L 5 5 z');
+
+ var patterns = defs.selectAll('pattern')
+ .data([
+ // pattern name, pattern image name
+ ['wetland', 'wetland'],
+ ['construction', 'construction'],
+ ['cemetery', 'cemetery'],
+ ['orchard', 'orchard'],
+ ['farmland', 'farmland'],
+ ['beach', 'dots'],
+ ['scrub', 'dots'],
+ ['meadow', 'dots']
+ ])
+ .enter()
+ .append('pattern')
+ .attr({
+ id: function (d) {
+ return 'pattern-' + d[0];
+ },
+ width: 32,
+ height: 32,
+ patternUnits: 'userSpaceOnUse'
+ });
+
+ patterns.append('rect')
+ .attr({
+ x: 0,
+ y: 0,
+ width: 32,
+ height: 32,
+ 'class': function (d) {
+ return 'pattern-color-' + d[0];
+ }
+ });
+
+ patterns.append('image')
+ .attr({
+ x: 0,
+ y: 0,
+ width: 32,
+ height: 32
+ })
+ .attr('xlink:href', function (d) {
+ return context.imagePath('pattern/' + d[1] + '.png');
+ });
+
+ defs.selectAll()
+ .data([12, 18, 20, 32, 45])
+ .enter().append('clipPath')
+ .attr('id', function (d) {
+ return 'clip-square-' + d;
+ })
+ .append('rect')
+ .attr('x', 0)
+ .attr('y', 0)
+ .attr('width', function (d) {
+ return d;
+ })
+ .attr('height', function (d) {
+ return d;
+ });
+
+ var maki = [];
+ _.forEach(iD.data.featureIcons, function (dimensions, name) {
+ if (dimensions['12'] && dimensions['18'] && dimensions['24']) {
+ maki.push({key: 'maki-' + name + '-12', value: dimensions['12']});
+ maki.push({key: 'maki-' + name + '-18', value: dimensions['18']});
+ maki.push({key: 'maki-' + name + '-24', value: dimensions['24']});
+ }
+ });
+
+ defs.call(SpriteDefinition(
+ 'sprite',
+ context.imagePath('sprite.svg'),
+ d3.entries(iD.data.operations)));
+
+ defs.call(SpriteDefinition(
+ 'maki-sprite',
+ context.imagePath('maki-sprite.png'),
+ maki));
+ };
+};
iD.svg.Labels = function(projection, context) {
var path = d3.geo.path().projection(projection);
for (var i = 0; i < entities.length; i++) {
var entity = entities[i];
- if (entity.type !== 'way') continue;
- if (context.selectedIDs().indexOf(entity.id) < 0) continue;
+ if (entity.type !== 'way')
+ continue;
+ if (!filter(entity))
+ continue;
+ if (context.selectedIDs().indexOf(entity.id) < 0)
+ continue;
var nodes = graph.childNodes(entity);
-
- // skip the last node because it is always repeated
for (var j = 0; j < nodes.length - 1; j++) {
var a = nodes[j],
b = nodes[j + 1],
id = [a.id, b.id].sort().join('-');
- // Redraw midpoints in two cases:
- // 1. One of the two endpoint nodes changed (e.g. was moved).
- // 2. A node was deleted. The midpoint between the two new
- // endpoints needs to be redrawn. In this case only the
- // way will be in the diff.
- if (!midpoints[id] && (filter(a) || filter(b) || filter(entity))) {
+ if (midpoints[id]) {
+ midpoints[id].parents.push(entity);
+ } else {
var loc = iD.geo.interp(a.loc, b.loc, 0.5);
if (extent.intersects(loc) && iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
midpoints[id] = {
type: 'midpoint',
id: id,
loc: loc,
- edge: [a.id, b.id]
+ edge: [a.id, b.id],
+ parents: [entity]
};
}
}
}
}
+ function midpointFilter(d) {
+ if (midpoints[d.id])
+ return true;
+
+ for (var i = 0; i < d.parents.length; i++)
+ if (filter(d.parents[i]))
+ return true;
+
+ return false;
+ }
+
var groups = surface.select('.layer-hit').selectAll('g.midpoint')
- .filter(filter)
+ .filter(midpointFilter)
.data(_.values(midpoints), function(d) { return d.id; });
var group = groups.enter()
return drawPoints;
};
-iD.svg.Restrictions = function(context) {
- var projection = context.projection;
-
- function drawRestrictions(surface) {
- var turns = drawRestrictions.turns(context.graph(), context.selectedIDs());
-
- var groups = surface.select('.layer-hit').selectAll('g.restriction')
- .data(turns, iD.Entity.key);
-
- var enter = groups.enter().append('g')
- .attr('class', 'restriction');
-
- enter.append('circle')
- .attr('class', 'restriction')
- .attr('r', 4);
-
- groups
- .attr('transform', function(restriction) {
- var via = context.entity(restriction.memberByRole('via').id);
- return iD.svg.PointTransform(projection)(via);
- });
-
- groups.exit()
- .remove();
-
- return this;
- }
-
- drawRestrictions.turns = function (graph, selectedIDs) {
- if (selectedIDs.length !== 1)
- return [];
-
- var from = graph.entity(selectedIDs[0]);
- if (from.type !== 'way')
- return [];
-
- return graph.parentRelations(from).filter(function(relation) {
- var f = relation.memberById(from.id),
- t = relation.memberByRole('to'),
- v = relation.memberByRole('via');
-
- return relation.tags.type === 'restriction' && f.role === 'from' &&
- t && t.type === 'way' && graph.hasEntity(t.id) &&
- v && v.type === 'node' && graph.hasEntity(v.id) &&
- !graph.entity(t.id).isDegenerate() &&
- !graph.entity(f.id).isDegenerate() &&
- graph.entity(t.id).affix(v.id) &&
- graph.entity(f.id).affix(v.id);
- });
- };
-
- drawRestrictions.datum = function(graph, from, restriction, projection) {
- var to = graph.entity(restriction.memberByRole('to').id),
- a = graph.entity(restriction.memberByRole('via').id),
- b;
-
- if (to.first() === a.id) {
- b = graph.entity(to.nodes[1]);
- } else {
- b = graph.entity(to.nodes[to.nodes.length - 2]);
- }
-
- a = projection(a.loc);
- b = projection(b.loc);
-
- return {
- from: from,
- to: to,
- restriction: restriction,
- angle: Math.atan2(b[1] - a[1], b[0] - a[0])
- };
- };
-
- return drawRestrictions;
-};
-iD.svg.Surface = function(context) {
- function autosize(image) {
- var img = document.createElement('img');
- img.src = image.attr('xlink:href');
- img.onload = function() {
- image.attr({
- width: img.width,
- height: img.height
- });
- };
- }
-
- function SpriteDefinition(id, href, data) {
- return function(defs) {
- defs.append('image')
- .attr('id', id)
- .attr('xlink:href', href)
- .call(autosize);
-
- defs.selectAll()
- .data(data)
- .enter().append('use')
- .attr('id', function(d) { return d.key; })
- .attr('transform', function(d) { return 'translate(-' + d.value[0] + ',-' + d.value[1] + ')'; })
- .attr('xlink:href', '#' + id);
- };
- }
-
- return function drawSurface(selection) {
- var defs = selection.append('defs');
-
- defs.append('marker')
- .attr({
- id: 'oneway-marker',
- viewBox: '0 0 10 10',
- refY: 2.5,
- refX: 5,
- markerWidth: 2,
- markerHeight: 2,
- orient: 'auto'
- })
- .append('path')
- .attr('d', 'M 5 3 L 0 3 L 0 2 L 5 2 L 5 0 L 10 2.5 L 5 5 z');
-
- var patterns = defs.selectAll('pattern')
- .data([
- // pattern name, pattern image name
- ['wetland', 'wetland'],
- ['construction', 'construction'],
- ['cemetery', 'cemetery'],
- ['orchard', 'orchard'],
- ['farmland', 'farmland'],
- ['beach', 'dots'],
- ['scrub', 'dots'],
- ['meadow', 'dots']])
- .enter()
- .append('pattern')
- .attr({
- id: function(d) { return 'pattern-' + d[0]; },
- width: 32,
- height: 32,
- patternUnits: 'userSpaceOnUse'
- });
-
- patterns.append('rect')
- .attr({
- x: 0,
- y: 0,
- width: 32,
- height: 32,
- 'class': function(d) { return 'pattern-color-' + d[0]; }
- });
-
- patterns.append('image')
- .attr({
- x: 0,
- y: 0,
- width: 32,
- height: 32
- })
- .attr('xlink:href', function(d) { return context.imagePath('pattern/' + d[1] + '.png'); });
-
- defs.selectAll()
- .data([12, 18, 20])
- .enter().append('clipPath')
- .attr('id', function(d) { return 'clip-square-' + d; })
- .append('rect')
- .attr('x', 0)
- .attr('y', 0)
- .attr('width', function(d) { return d; })
- .attr('height', function(d) { return d; });
-
- var maki = [];
- _.forEach(iD.data.featureIcons, function(dimensions, name) {
- if (dimensions['12'] && dimensions['18'] && dimensions['24']) {
- maki.push({key: 'maki-' + name + '-12', value: dimensions['12']});
- maki.push({key: 'maki-' + name + '-18', value: dimensions['18']});
- maki.push({key: 'maki-' + name + '-24', value: dimensions['24']});
- }
- });
-
- defs.call(SpriteDefinition(
- 'sprite',
- context.imagePath('sprite.svg'),
- d3.entries(iD.data.operations)));
-
- defs.call(SpriteDefinition(
- 'maki-sprite',
- context.imagePath('maki-sprite.png'),
- maki));
-
+iD.svg.Surface = function() {
+ return function (selection) {
var layers = selection.selectAll('.layer')
.data(['fill', 'shadow', 'casing', 'stroke', 'oneway', 'hit', 'halo', 'label']);
};
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; };
return tagClasses;
};
+iD.svg.Turns = function(projection) {
+ return function(surface, graph, turns) {
+ function key(turn) {
+ return [turn.from.node + turn.via.node + turn.to.node].join('-');
+ }
+
+ function icon(turn) {
+ var u = turn.u ? '-u' : '';
+ if (!turn.restriction)
+ return '#icon-restriction-yes' + u;
+ var restriction = graph.entity(turn.restriction).tags.restriction;
+ return '#icon-restriction-' +
+ (!turn.indirect_restriction && /^only_/.test(restriction) ? 'only' : 'no') + u;
+ }
+
+ var groups = surface.select('.layer-hit').selectAll('g.turn')
+ .data(turns, key);
+
+ // Enter
+
+ var enter = groups.enter().append('g')
+ .attr('class', 'turn');
+
+ var nEnter = enter.filter(function (turn) { return !turn.u; });
+
+ nEnter.append('rect')
+ .attr('transform', 'translate(-12, -12)')
+ .attr('width', '45')
+ .attr('height', '25');
+
+ nEnter.append('use')
+ .attr('transform', 'translate(-12, -12)')
+ .attr('clip-path', 'url(#clip-square-45)');
+
+ var uEnter = enter.filter(function (turn) { return turn.u; });
+
+ uEnter.append('circle')
+ .attr('r', '16');
+
+ uEnter.append('use')
+ .attr('transform', 'translate(-16, -16)')
+ .attr('clip-path', 'url(#clip-square-32)');
+
+ // Update
+
+ groups
+ .attr('transform', function (turn) {
+ var v = graph.entity(turn.via.node),
+ t = graph.entity(turn.to.node),
+ a = iD.geo.angle(v, t, projection),
+ p = projection(v.loc),
+ r = turn.u ? 0 : 60;
+
+ return 'translate(' + (r * Math.cos(a) + p[0]) + ',' + (r * Math.sin(a) + p[1]) + ')' +
+ 'rotate(' + a * 180 / Math.PI + ')';
+ });
+
+ groups.select('use')
+ .attr('xlink:href', icon);
+
+ groups.select('rect');
+ groups.select('circle');
+
+ // Exit
+
+ groups.exit()
+ .remove();
+
+ return this;
+ };
+};
iD.svg.Vertices = function(projection, context) {
var radiuses = {
// z16-, z17, z18+, tagged
map.centerZoom([-77.02271, 38.90085], 20);
}
+ container.append('svg')
+ .attr('id', 'defs')
+ .call(iD.svg.Defs(context));
+
container.append('div')
.attr('id', 'sidebar')
.attr('class', 'col4')
['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;
preset,
reference;
+ var presetEditor = iD.ui.preset(context)
+ .on('change', changeTags);
var rawTagEditor = iD.ui.RawTagEditor(context)
.on('change', changeTags);
.text(preset.name());
$body.select('.inspector-preset')
- .call(iD.ui.preset(context)
+ .call(presetEditor
.preset(preset)
.entityID(id)
.tags(tags)
- .state(state)
- .on('change', changeTags));
+ .state(state));
$body.select('.raw-tag-editor')
.call(rawTagEditor
function clean(o) {
var out = {}, k, v;
+ /*jshint -W083 */
for (k in o) {
if (k && (v = o[k]) !== undefined) {
- out[k] = v.trim();
+ out[k] = v.split(';').map(function(s) { return s.trim(); }).join(';');
}
}
+ /*jshint +W083 */
return out;
}
var $presetPane = $wrap.select('.preset-list-pane');
var $editorPane = $wrap.select('.entity-editor-pane');
- var showEditor = state === 'hover' || context.entity(entityID).isUsed(context.graph());
+ var graph = context.graph(),
+ entity = context.entity(entityID),
+ showEditor = state === 'hover' ||
+ entity.isUsed(graph) ||
+ entity.isHighwayIntersection(graph);
+
if (showEditor) {
$wrap.style('right', '0%');
$editorPane.call(entityEditor);
}
});
+ if (entity.isHighwayIntersection(context.graph())) {
+ fields.push(UIField(context.presets().field('restrictions'), entity, true));
+ }
+
context.presets().universal().forEach(function(field) {
if (preset.fields.indexOf(field) < 0) {
fields.push(UIField(field, entity));
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);
function show(field) {
field.show = true;
- presets(selection);
+ context.presets()(selection);
field.input.focus();
}
presets.preset = function(_) {
if (!arguments.length) return preset;
+ if (preset && preset.id === _.id) return presets;
preset = _;
fields = null;
return presets;
presets.entityID = function(_) {
if (!arguments.length) return id;
+ if (id === _) return presets;
id = _;
fields = null;
return presets;
$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);
}
sidebar.hide = function() {
featureListWrap.classed('inspector-hidden', false);
+ inspectorWrap.classed('inspector-hidden', true);
if (current) current.remove();
current = null;
};
}
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;
+ });
});
};
city = wrap.select('.addr-city');
postcode = wrap.select('.addr-postcode');
- wrap.selectAll('input')
- .on('blur', change)
- .on('change', change);
-
street
.call(d3.combobox()
.fetcher(function(value, callback) {
.fetcher(function(value, callback) {
callback(getPostCodes());
}));
+
+ wrap.selectAll('input')
+ .on('blur', change)
+ .on('change', change);
}
function change() {
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'],
- value,
- box,
- text,
- label;
+ options = field.strings && field.strings.options,
+ values = [],
+ texts = [],
+ entity, value, box, text, label;
+
+ if (options) {
+ for (var k in options) {
+ values.push(k === 'undefined' ? undefined : k);
+ texts.push(field.t('check.' + k, { 'default': options[k] }));
+ }
+ } else {
+ values = [undefined, 'yes'];
+ texts = [t('inspector.unknown'), t('inspector.check.yes')];
+ if (field.type === 'check') {
+ values.push('no');
+ texts.push(t('inspector.check.no'));
+ }
+ }
var check = function(selection) {
+ // hack: pretend oneway field is a oneway_yes field
+ // where implied oneway tag exists (e.g. `junction=roundabout`) #2220, #1841
+ if (field.id === 'oneway') {
+ for (var key in entity.tags) {
+ if (key in iD.oneWayTags && (entity.tags[key] in iD.oneWayTags[key])) {
+ texts.shift();
+ texts.unshift(t('presets.fields.oneway_yes.check.undefined', { 'default': 'Assumed to be Yes' }));
+ break;
+ }
+ }
+ }
+
selection.classed('checkselect', 'true');
label = selection.selectAll('.preset-input-wrap')
.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);
enter.append('span')
- .text(t('inspector.unknown'))
+ .text(texts[0])
.attr('class', 'value');
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();
});
text = label.select('span.value');
};
+ check.entity = function(_) {
+ if (!arguments.length) return entity;
+ entity = _;
+ return check;
+ };
+
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(texts[values.indexOf(value)]);
label.classed('set', !!value);
};
.attr('id', 'preset-input-' + field.id);
input
+ .call(combobox)
.on('change', change)
.on('blur', change)
.each(function() {
if (!err) options(_.pluck(data, 'value'));
});
}
- })
- .call(combobox);
+ });
function options(opts) {
combobox.data(opts.map(function(d) {
var o = {};
- o.title = o.value = d.replace('_', ' ');
+ o.title = o.value = d.replace(/_+/g, ' ');
return o;
}));
}
function change() {
- var value = input.value().replace(' ', '_');
+ var value = input.value()
+ .split(';')
+ .map(function(s) { return s.trim(); })
+ .join(';')
+ .replace(/\s+/g, '_');
+
if (field.type === 'typeCombo' && !value) value = 'yes';
var t = {};
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 =
.attr('class', 'localized-main')
.attr('placeholder', field.placeholder());
- input
- .on('blur', change)
- .on('change', change);
-
if (field.id === 'name') {
var preset = context.presets().match(entity, context.graph());
input.call(d3.combobox().fetcher(
));
}
+ input
+ .on('blur', change)
+ .on('change', change);
+
var translateButton = selection.selectAll('.localized-add')
.data([0]);
.attr('placeholder', field.placeholder());
input
+ .call(combobox)
.on('change', change)
- .on('blur', change)
- .call(combobox);
+ .on('blur', change);
var childNodes = context.graph().childNodes(context.entity(entity.id)),
loc = childNodes[~~(childNodes.length/2)].loc;
return d3.rebind(radio, event, 'on');
};
+iD.ui.preset.restrictions = function(field, context) {
+ var event = d3.dispatch('change'),
+ vertexID,
+ fromNodeID;
+
+ function restrictions(selection) {
+ var wrap = selection.selectAll('.preset-input-wrap')
+ .data([0]);
+
+ var enter = wrap.enter().append('div')
+ .attr('class', 'preset-input-wrap');
+
+ enter.append('div')
+ .attr('class', 'restriction-help');
+
+ enter.append('svg')
+ .call(iD.svg.Surface(context))
+ .call(iD.behavior.Hover(context));
+
+ var intersection = iD.geo.Intersection(context.graph(), vertexID),
+ graph = intersection.graph,
+ vertex = graph.entity(vertexID),
+ surface = wrap.selectAll('svg'),
+ filter = function () { return true; },
+ extent = iD.geo.Extent(),
+ projection = iD.geo.RawMercator(),
+ lines = iD.svg.Lines(projection, context),
+ vertices = iD.svg.Vertices(projection, context),
+ turns = iD.svg.Turns(projection, context);
+
+ var d = wrap.dimensions(),
+ c = [d[0] / 2, d[1] / 2],
+ z = 21;
+
+ projection
+ .scale(256 * Math.pow(2, z) / (2 * Math.PI));
+
+ var s = projection(vertex.loc);
+
+ projection
+ .translate([c[0] - s[0], c[1] - s[1]])
+ .clipExtent([[0, 0], d]);
+
+ surface
+ .call(vertices, graph, [vertex], filter, extent, z)
+ .call(lines, graph, intersection.highways, filter)
+ .call(turns, graph, intersection.turns(fromNodeID));
+
+ surface
+ .on('click.restrictions', click)
+ .on('mouseover.restrictions', mouseover)
+ .on('mouseout.restrictions', mouseout);
+
+ surface
+ .selectAll('.selected')
+ .classed('selected', false);
+
+ if (fromNodeID) {
+ surface
+ .selectAll('.' + _.find(intersection.highways, function(way) { return way.contains(fromNodeID); }).id)
+ .classed('selected', true);
+ }
+
+ mouseout();
+
+ context.history()
+ .on('change.restrictions', render);
+
+ d3.select(window)
+ .on('resize.restrictions', render);
+
+ function click() {
+ var datum = d3.event.target.__data__;
+ if (datum instanceof iD.Entity) {
+ fromNodeID = datum.nodes[(datum.first() === vertexID) ? 1 : datum.nodes.length - 2];
+ render();
+ } else if (datum instanceof iD.geo.Turn) {
+ if (datum.restriction) {
+ context.perform(
+ iD.actions.UnrestrictTurn(datum, projection),
+ t('operations.restriction.annotation.delete'));
+ } else {
+ context.perform(
+ iD.actions.RestrictTurn(datum, projection),
+ t('operations.restriction.annotation.create'));
+ }
+ }
+ }
+
+ function mouseover() {
+ var datum = d3.event.target.__data__;
+ if (datum instanceof iD.geo.Turn) {
+ var graph = context.graph(),
+ presets = context.presets(),
+ preset;
+
+ if (datum.restriction) {
+ preset = presets.match(graph.entity(datum.restriction), graph);
+ } else {
+ preset = presets.item('type/restriction/' +
+ iD.geo.inferRestriction(
+ graph.entity(datum.from.node),
+ graph.entity(datum.via.node),
+ graph.entity(datum.to.node),
+ projection));
+ }
+
+ wrap.selectAll('.restriction-help')
+ .text(t('operations.restriction.help.' +
+ (datum.restriction ? 'toggle_off' : 'toggle_on'),
+ {restriction: preset.name()}));
+ }
+ }
+
+ function mouseout() {
+ wrap.selectAll('.restriction-help')
+ .text(t('operations.restriction.help.' +
+ (fromNodeID ? 'toggle' : 'select')));
+ }
+
+ function render() {
+ if (context.hasEntity(vertexID)) {
+ restrictions(selection);
+ }
+ }
+ }
+
+ restrictions.entity = function(_) {
+ if (!vertexID || vertexID !== _.id) {
+ fromNodeID = null;
+ vertexID = _.id;
+ }
+ };
+
+ restrictions.tags = function() {};
+ restrictions.focus = function() {};
+
+ return d3.rebind(restrictions, event, 'on');
+};
iD.ui.preset.textarea = function(field) {
var event = d3.dispatch('change'),
.value('English');
lang
+ .call(langcombo)
.on('blur', changeLang)
- .on('change', changeLang)
- .call(langcombo);
+ .on('change', changeLang);
title = selection.selectAll('input.wiki-title')
.data([0]);
.attr('id', 'preset-input-' + field.id);
title
+ .call(titlecombo)
.on('blur', change)
- .on('change', change)
- .call(titlecombo);
+ .on('change', change);
link = selection.selectAll('a.wiki-link')
.data([0]);
field.id = id;
field.matchGeometry = function(geometry) {
- return !field.geometry || field.geometry.indexOf(geometry) >= 0;
+ return !field.geometry || field.geometry === geometry;
};
field.t = function(scope, options) {
"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",
"opening_hours"
]
},
+ "amenity/dojo": {
+ "icon": "pitch",
+ "geometry": [
+ "point",
+ "area"
+ ],
+ "terms": [
+ "martial arts",
+ "dojo",
+ "dojang"
+ ],
+ "tags": {
+ "amenity": "dojo"
+ },
+ "fields": [
+ "address",
+ "sport"
+ ],
+ "name": "Dojo / Martial Arts Academy"
+ },
"amenity/drinking_water": {
"icon": "water",
"geometry": [
"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": [
"crossing",
"access",
- "surface"
+ "surface",
+ "sloped_curb",
+ "tactile_paving"
],
"geometry": [
"line"
"highway": "footway",
"footway": "crossing"
},
+ "terms": [],
+ "name": "Crossing"
+ },
+ "footway/crosswalk": {
+ "fields": [
+ "crossing",
+ "access",
+ "surface",
+ "sloped_curb",
+ "tactile_paving"
+ ],
+ "geometry": [
+ "line"
+ ],
+ "tags": {
+ "highway": "footway",
+ "footway": "crossing",
+ "crossing": "zebra"
+ },
"terms": [
"crosswalk",
"zebra crossing"
],
- "name": "Crossing"
+ "name": "Crosswalk"
},
"footway/sidewalk": {
"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"
"tags": {
"highway": "crossing"
},
+ "terms": [],
+ "name": "Crossing"
+ },
+ "highway/crosswalk": {
+ "fields": [
+ "crossing",
+ "sloped_curb",
+ "tactile_paving"
+ ],
+ "geometry": [
+ "vertex"
+ ],
+ "tags": {
+ "highway": "crossing",
+ "crossing": "zebra"
+ },
"terms": [
"crosswalk",
"zebra crossing"
],
- "name": "Crossing"
+ "name": "Crosswalk"
},
"highway/cycleway": {
"icon": "highway-cycleway",
"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/motorway": {
"icon": "highway-motorway",
"fields": [
- "oneway",
+ "oneway_yes",
"maxspeed",
"structure",
"access",
"fields": [
"ref"
],
- "name": "Motorway Junction"
+ "name": "Motorway Junction / Exit"
},
"highway/motorway_link": {
"icon": "highway-motorway-link",
"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",
"name": "Slipway"
},
"leisure/sports_center": {
+ "icon": "pitch",
"geometry": [
"point",
"area"
"terms": [
"gym"
],
- "icon": "sports",
- "name": "Sports Center"
+ "fields": [
+ "sport"
+ ],
+ "name": "Sports Center / Gym"
},
"leisure/stadium": {
+ "icon": "pitch",
"geometry": [
"point",
"area"
"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"
"name": "Restriction",
"icon": "restriction",
"fields": [
- "restriction"
+ "restriction",
+ "except"
]
},
+ "type/restriction/no_left_turn": {
+ "name": "No Left Turn",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "no_left_turn"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-no-left-turn"
+ },
+ "type/restriction/no_right_turn": {
+ "name": "No Right Turn",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "no_right_turn"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-no-right-turn"
+ },
+ "type/restriction/no_straight_on": {
+ "name": "No Straight On",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "no_straight_on"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-no-straight-on"
+ },
+ "type/restriction/no_u_turn": {
+ "name": "No U-turn",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "no_u_turn"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-no-u-turn"
+ },
+ "type/restriction/only_left_turn": {
+ "name": "Left Turn Only",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "only_left_turn"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-only-left-turn"
+ },
+ "type/restriction/only_right_turn": {
+ "name": "Right Turn Only",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "only_right_turn"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-only-right-turn"
+ },
+ "type/restriction/only_straight_on": {
+ "name": "No Turns",
+ "geometry": [
+ "relation"
+ ],
+ "tags": {
+ "type": "restriction",
+ "restriction": "only_straight_on"
+ },
+ "fields": [
+ "except"
+ ],
+ "icon": "restriction-only-straight-on"
+ },
"type/route": {
"geometry": [
"relation"
},
"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"
],
"suggestion": true
},
- "amenity/fuel/Sainsbury's": {
- "tags": {
- "name": "Sainsbury's",
- "amenity": "fuel"
- },
- "name": "Sainsbury's",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/OMV": {
"tags": {
"name": "OMV",
],
"suggestion": true
},
- "amenity/fuel/Tesco": {
- "tags": {
- "name": "Tesco",
- "amenity": "fuel"
- },
- "name": "Tesco",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/JET": {
"tags": {
"name": "JET",
],
"suggestion": true
},
- "amenity/fuel/Morrisons": {
- "tags": {
- "name": "Morrisons",
- "amenity": "fuel"
- },
- "name": "Morrisons",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/United": {
"tags": {
"name": "United",
],
"suggestion": true
},
- "amenity/fuel/Canadian Tire": {
- "tags": {
- "name": "Canadian Tire",
- "amenity": "fuel"
- },
- "name": "Canadian Tire",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Mobil": {
"tags": {
"name": "Mobil",
],
"suggestion": true
},
- "amenity/fuel/ABC": {
- "tags": {
- "name": "ABC",
- "amenity": "fuel"
- },
- "name": "ABC",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/ARAL": {
"tags": {
"name": "ARAL",
],
"suggestion": true
},
- "amenity/fuel/Intermarché": {
- "tags": {
- "name": "Intermarché",
- "amenity": "fuel"
- },
- "name": "Intermarché",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Total Access": {
"tags": {
"name": "Total Access",
],
"suggestion": true
},
- "amenity/fuel/Super U": {
- "tags": {
- "name": "Super U",
- "amenity": "fuel"
- },
- "name": "Super U",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
- "amenity/fuel/Auchan": {
- "tags": {
- "name": "Auchan",
- "amenity": "fuel"
- },
- "name": "Auchan",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Elf": {
"tags": {
"name": "Elf",
],
"suggestion": true
},
- "amenity/fuel/Carrefour": {
- "tags": {
- "name": "Carrefour",
- "amenity": "fuel"
- },
- "name": "Carrefour",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Station Service E. Leclerc": {
"tags": {
"name": "Station Service E. Leclerc",
],
"suggestion": true
},
- "amenity/fuel/Raiffeisenbank": {
- "tags": {
- "name": "Raiffeisenbank",
- "amenity": "fuel"
- },
- "name": "Raiffeisenbank",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Tamoil": {
"tags": {
"name": "Tamoil",
],
"suggestion": true
},
- "amenity/fuel/Coop": {
- "tags": {
- "name": "Coop",
- "amenity": "fuel"
- },
- "name": "Coop",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Orlen": {
"tags": {
"name": "Orlen",
],
"suggestion": true
},
- "amenity/fuel/7-Eleven": {
- "tags": {
- "name": "7-Eleven",
- "amenity": "fuel"
- },
- "name": "7-Eleven",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Agrola": {
"tags": {
"name": "Agrola",
],
"suggestion": true
},
- "amenity/fuel/Wawa": {
- "tags": {
- "name": "Wawa",
- "amenity": "fuel"
- },
- "name": "Wawa",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Pertamina": {
"tags": {
"name": "Pertamina",
],
"suggestion": true
},
- "amenity/fuel/Circle K": {
- "tags": {
- "name": "Circle K",
- "amenity": "fuel"
- },
- "name": "Circle K",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Posto Ipiranga": {
"tags": {
"name": "Posto Ipiranga",
],
"suggestion": true
},
- "amenity/fuel/Stewart's": {
- "tags": {
- "name": "Stewart's",
- "amenity": "fuel"
- },
- "name": "Stewart's",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Posto BR": {
"tags": {
"name": "Posto BR",
],
"suggestion": true
},
- "amenity/fuel/H-E-B": {
- "tags": {
- "name": "H-E-B",
- "amenity": "fuel"
- },
- "name": "H-E-B",
- "icon": "fuel",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "address",
- "building_area"
- ],
- "suggestion": true
- },
"amenity/fuel/Укрнафта": {
"tags": {
"name": "Укрнафта",
],
"suggestion": true
},
+ "amenity/fast_food/Subway": {
+ "tags": {
+ "name": "Subway",
+ "cuisine": "sandwich",
+ "amenity": "fast_food"
+ },
+ "name": "Subway",
+ "icon": "fast-food",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "cuisine",
+ "building_area",
+ "address",
+ "opening_hours",
+ "smoking"
+ ],
+ "suggestion": true
+ },
"amenity/fast_food/Burger King": {
"tags": {
"name": "Burger King",
],
"suggestion": true
},
+ "amenity/bank/Raiffeisenbank": {
+ "tags": {
+ "name": "Raiffeisenbank",
+ "amenity": "bank"
+ },
+ "name": "Raiffeisenbank",
+ "icon": "bank",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "atm",
+ "building_area",
+ "address",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"amenity/bank/Yorkshire Bank": {
"tags": {
"name": "Yorkshire Bank",
],
"suggestion": true
},
- "amenity/pharmacy/Радуга": {
- "tags": {
- "name": "Радуга",
- "amenity": "pharmacy"
- },
- "name": "Радуга",
- "icon": "pharmacy",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address",
- "opening_hours"
- ],
- "suggestion": true
- },
"amenity/pharmacy/サンドラッグ": {
"tags": {
"name": "サンドラッグ",
],
"suggestion": true
},
+ "shop/supermarket/Morrisons": {
+ "tags": {
+ "name": "Morrisons",
+ "shop": "supermarket"
+ },
+ "name": "Morrisons",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Interspar": {
"tags": {
"name": "Interspar",
],
"suggestion": true
},
+ "shop/supermarket/Sainsbury's": {
+ "tags": {
+ "name": "Sainsbury's",
+ "shop": "supermarket"
+ },
+ "name": "Sainsbury's",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Lidl": {
"tags": {
"name": "Lidl",
],
"suggestion": true
},
+ "shop/supermarket/Coop": {
+ "tags": {
+ "name": "Coop",
+ "shop": "supermarket"
+ },
+ "name": "Coop",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
+ "shop/supermarket/Tesco": {
+ "tags": {
+ "name": "Tesco",
+ "shop": "supermarket"
+ },
+ "name": "Tesco",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Woolworths": {
"tags": {
"name": "Woolworths",
],
"suggestion": true
},
- "shop/supermarket/Tesco Express": {
- "tags": {
- "name": "Tesco Express",
- "shop": "supermarket"
- },
- "name": "Tesco Express",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/King Soopers": {
"tags": {
"name": "King Soopers",
],
"suggestion": true
},
+ "shop/supermarket/Carrefour": {
+ "tags": {
+ "name": "Carrefour",
+ "shop": "supermarket"
+ },
+ "name": "Carrefour",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Waitrose": {
"tags": {
"name": "Waitrose",
],
"suggestion": true
},
+ "shop/supermarket/Super U": {
+ "tags": {
+ "name": "Super U",
+ "shop": "supermarket"
+ },
+ "name": "Super U",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Metro": {
"tags": {
"name": "Metro",
],
"suggestion": true
},
- "shop/supermarket/COOP Jednota": {
- "tags": {
- "name": "COOP Jednota",
- "shop": "supermarket"
- },
- "name": "COOP Jednota",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Rema 1000": {
"tags": {
"name": "Rema 1000",
],
"suggestion": true
},
+ "shop/supermarket/Auchan": {
+ "tags": {
+ "name": "Auchan",
+ "shop": "supermarket"
+ },
+ "name": "Auchan",
+ "icon": "grocery",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "operator",
+ "building_area",
+ "address"
+ ],
+ "suggestion": true
+ },
"shop/supermarket/Mercadona": {
"tags": {
"name": "Mercadona",
],
"suggestion": true
},
- "shop/supermarket/Costcutter": {
+ "shop/supermarket/Maxi": {
"tags": {
- "name": "Costcutter",
+ "name": "Maxi",
"shop": "supermarket"
},
- "name": "Costcutter",
+ "name": "Maxi",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Maxi": {
+ "shop/supermarket/Colruyt": {
"tags": {
- "name": "Maxi",
+ "name": "Colruyt",
"shop": "supermarket"
},
- "name": "Maxi",
+ "name": "Colruyt",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Colruyt": {
+ "shop/supermarket/The Co-operative": {
"tags": {
- "name": "Colruyt",
+ "name": "The Co-operative",
"shop": "supermarket"
},
- "name": "Colruyt",
+ "name": "The Co-operative",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/The Co-operative": {
+ "shop/supermarket/Intermarché": {
"tags": {
- "name": "The Co-operative",
+ "name": "Intermarché",
"shop": "supermarket"
},
- "name": "The Co-operative",
+ "name": "Intermarché",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/dm": {
- "tags": {
- "name": "dm",
- "shop": "supermarket"
- },
- "name": "dm",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Kvickly": {
"tags": {
"name": "Kvickly",
],
"suggestion": true
},
- "shop/supermarket/Petit Casino": {
- "tags": {
- "name": "Petit Casino",
- "shop": "supermarket"
- },
- "name": "Petit Casino",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Wasgau": {
"tags": {
"name": "Wasgau",
],
"suggestion": true
},
- "shop/supermarket/Fressnapf": {
- "tags": {
- "name": "Fressnapf",
- "shop": "supermarket"
- },
- "name": "Fressnapf",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Coop Konsum": {
"tags": {
"name": "Coop Konsum",
],
"suggestion": true
},
- "shop/supermarket/Centra": {
- "tags": {
- "name": "Centra",
- "shop": "supermarket"
- },
- "name": "Centra",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Квартал": {
"tags": {
"name": "Квартал",
],
"suggestion": true
},
- "shop/supermarket/Атак": {
+ "shop/supermarket/H-E-B": {
"tags": {
- "name": "Атак",
+ "name": "H-E-B",
"shop": "supermarket"
},
- "name": "Атак",
+ "name": "H-E-B",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Ð\9fолÑ\83Ñ\88ка": {
+ "shop/supermarket/Ð\90Ñ\82ак": {
"tags": {
- "name": "Ð\9fолÑ\83Ñ\88ка",
+ "name": "Ð\90Ñ\82ак",
"shop": "supermarket"
},
- "name": "Ð\9fолÑ\83Ñ\88ка",
+ "name": "Ð\90Ñ\82ак",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Extra": {
+ "shop/supermarket/Полушка": {
"tags": {
- "name": "Extra",
+ "name": "Полушка",
"shop": "supermarket"
},
- "name": "Extra",
+ "name": "Полушка",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Lewiatan": {
+ "shop/supermarket/Extra": {
"tags": {
- "name": "Lewiatan",
+ "name": "Extra",
"shop": "supermarket"
},
- "name": "Lewiatan",
+ "name": "Extra",
"icon": "grocery",
"geometry": [
"point",
],
"suggestion": true
},
- "shop/supermarket/Społem": {
- "tags": {
- "name": "Społem",
- "shop": "supermarket"
- },
- "name": "Społem",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Bodega Aurrera": {
"tags": {
"name": "Bodega Aurrera",
],
"suggestion": true
},
- "shop/supermarket/Магазин": {
- "tags": {
- "name": "Магазин",
- "shop": "supermarket"
- },
- "name": "Магазин",
- "icon": "grocery",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "operator",
- "building_area",
- "address"
- ],
- "suggestion": true
- },
"shop/supermarket/Монетка": {
"tags": {
"name": "Монетка",
],
"suggestion": true
},
+ "shop/convenience/Tesco Express": {
+ "tags": {
+ "name": "Tesco Express",
+ "shop": "convenience"
+ },
+ "name": "Tesco Express",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/One Stop": {
"tags": {
"name": "One Stop",
],
"suggestion": true
},
+ "shop/convenience/7-Eleven": {
+ "tags": {
+ "name": "7-Eleven",
+ "shop": "convenience"
+ },
+ "name": "7-Eleven",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Sale": {
"tags": {
"name": "Sale",
],
"suggestion": true
},
+ "shop/convenience/COOP Jednota": {
+ "tags": {
+ "name": "COOP Jednota",
+ "shop": "convenience"
+ },
+ "name": "COOP Jednota",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Mac's": {
"tags": {
"name": "Mac's",
],
"suggestion": true
},
+ "shop/convenience/Costcutter": {
+ "tags": {
+ "name": "Costcutter",
+ "shop": "convenience"
+ },
+ "name": "Costcutter",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Valintatalo": {
"tags": {
"name": "Valintatalo",
],
"suggestion": true
},
+ "shop/convenience/Circle K": {
+ "tags": {
+ "name": "Circle K",
+ "shop": "convenience"
+ },
+ "name": "Circle K",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/セブンイレブン": {
"tags": {
"name": "セブンイレブン",
],
"suggestion": true
},
+ "shop/convenience/Petit Casino": {
+ "tags": {
+ "name": "Petit Casino",
+ "shop": "convenience"
+ },
+ "name": "Petit Casino",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Mace": {
"tags": {
"name": "Mace",
],
"suggestion": true
},
+ "shop/convenience/ABC": {
+ "tags": {
+ "name": "ABC",
+ "shop": "convenience"
+ },
+ "name": "ABC",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/ミニストップ": {
"tags": {
"name": "ミニストップ",
],
"suggestion": true
},
+ "shop/convenience/Магазин": {
+ "tags": {
+ "name": "Магазин",
+ "shop": "convenience"
+ },
+ "name": "Магазин",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Гастроном": {
"tags": {
"name": "Гастроном",
],
"suggestion": true
},
+ "shop/convenience/Centra": {
+ "tags": {
+ "name": "Centra",
+ "shop": "convenience"
+ },
+ "name": "Centra",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/サークルK": {
"tags": {
"name": "サークルK",
],
"suggestion": true
},
+ "shop/convenience/Wawa": {
+ "tags": {
+ "name": "Wawa",
+ "shop": "convenience"
+ },
+ "name": "Wawa",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Proxi": {
"tags": {
"name": "Proxi",
],
"suggestion": true
},
+ "shop/convenience/Społem": {
+ "tags": {
+ "name": "Społem",
+ "shop": "convenience"
+ },
+ "name": "Społem",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Cumberland Farms": {
"tags": {
"name": "Cumberland Farms",
],
"suggestion": true
},
+ "shop/convenience/Kiosk": {
+ "tags": {
+ "name": "Kiosk",
+ "shop": "convenience"
+ },
+ "name": "Kiosk",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/24 часа": {
"tags": {
"name": "24 часа",
],
"suggestion": true
},
+ "shop/convenience/Stewart's": {
+ "tags": {
+ "name": "Stewart's",
+ "shop": "convenience"
+ },
+ "name": "Stewart's",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Продукти": {
"tags": {
"name": "Продукти",
],
"suggestion": true
},
+ "shop/convenience/Радуга": {
+ "tags": {
+ "name": "Радуга",
+ "shop": "convenience"
+ },
+ "name": "Радуга",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/ローソンストア100": {
"tags": {
"name": "ローソンストア100",
],
"suggestion": true
},
+ "shop/convenience/Lewiatan": {
+ "tags": {
+ "name": "Lewiatan",
+ "shop": "convenience"
+ },
+ "name": "Lewiatan",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/Продуктовый магазин": {
"tags": {
"name": "Продуктовый магазин",
],
"suggestion": true
},
+ "shop/convenience/Boutique": {
+ "tags": {
+ "name": "Boutique",
+ "shop": "convenience"
+ },
+ "name": "Boutique",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/convenience/მარკეტი (Market)": {
"tags": {
"name": "მარკეტი (Market)",
],
"suggestion": true
},
+ "shop/chemist/dm": {
+ "tags": {
+ "name": "dm",
+ "shop": "chemist"
+ },
+ "name": "dm",
+ "icon": "chemist",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/chemist/Müller": {
"tags": {
"name": "Müller",
"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",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
- "shop/car_repair/Peugeot": {
- "tags": {
- "name": "Peugeot",
- "shop": "car_repair"
- },
- "name": "Peugeot",
- "icon": "shop",
+ "icon": "chemist",
"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",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
- "shop/car_repair/Автозапчасти": {
- "tags": {
- "name": "Автозапчасти",
- "shop": "car_repair"
- },
- "name": "Автозапчасти",
- "icon": "shop",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
- "shop/car_repair/Renault": {
- "tags": {
- "name": "Renault",
- "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",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
- "shop/car_repair/Citroen": {
- "tags": {
- "name": "Citroen",
- "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/doityourself/Canadian Tire": {
+ "tags": {
+ "name": "Canadian Tire",
+ "shop": "doityourself"
+ },
+ "name": "Canadian Tire",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/doityourself/Leroy Merlin": {
"tags": {
"name": "Leroy Merlin",
],
"suggestion": true
},
- "shop/doityourself/Хозтовары": {
- "tags": {
- "name": "Хозтовары",
- "shop": "doityourself"
- },
- "name": "Хозтовары",
- "icon": "shop",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
"shop/doityourself/Стройматериалы": {
"tags": {
"name": "Стройматериалы",
],
"suggestion": true
},
+ "shop/car/Citroen": {
+ "tags": {
+ "name": "Citroen",
+ "shop": "car"
+ },
+ "name": "Citroen",
+ "icon": "car",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
+ "shop/car/Renault": {
+ "tags": {
+ "name": "Renault",
+ "shop": "car"
+ },
+ "name": "Renault",
+ "icon": "car",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/car/Mercedes-Benz": {
"tags": {
"name": "Mercedes-Benz",
],
"suggestion": true
},
+ "shop/car/Автозапчасти": {
+ "tags": {
+ "name": "Автозапчасти",
+ "shop": "car"
+ },
+ "name": "Автозапчасти",
+ "icon": "car",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/car/Opel": {
"tags": {
"name": "Opel",
],
"suggestion": true
},
+ "shop/car/Peugeot": {
+ "tags": {
+ "name": "Peugeot",
+ "shop": "car"
+ },
+ "name": "Peugeot",
+ "icon": "car",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/car/Hyundai": {
"tags": {
"name": "Hyundai",
],
"suggestion": true
},
- "shop/clothes/Deichmann": {
- "tags": {
- "name": "Deichmann",
- "shop": "clothes"
- },
- "name": "Deichmann",
- "icon": "clothing-store",
- "geometry": [
- "point",
- "vertex",
- "area"
- ],
- "fields": [
- "address",
- "building_area",
- "opening_hours"
- ],
- "suggestion": true
- },
"shop/clothes/Lindex": {
"tags": {
"name": "Lindex",
],
"suggestion": true
},
+ "shop/pet/Fressnapf": {
+ "tags": {
+ "name": "Fressnapf",
+ "shop": "pet"
+ },
+ "name": "Fressnapf",
+ "icon": "dog-park",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/pet/PetSmart": {
"tags": {
"name": "PetSmart",
],
"suggestion": true
},
+ "shop/shoes/Deichmann": {
+ "tags": {
+ "name": "Deichmann",
+ "shop": "shoes"
+ },
+ "name": "Deichmann",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/shoes/Reno": {
"tags": {
"name": "Reno",
"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",
],
"suggestion": true
},
+ "shop/hardware/Хозтовары": {
+ "tags": {
+ "name": "Хозтовары",
+ "shop": "hardware"
+ },
+ "name": "Хозтовары",
+ "icon": "shop",
+ "geometry": [
+ "point",
+ "vertex",
+ "area"
+ ],
+ "fields": [
+ "address",
+ "building_area",
+ "opening_hours"
+ ],
+ "suggestion": true
+ },
"shop/motorcycle/Yamaha": {
"tags": {
"name": "Yamaha",
"shop": "motorcycle"
},
"name": "Yamaha",
- "icon": "shop",
+ "icon": "scooter",
"geometry": [
"point",
"vertex",
"point"
],
"vertex": [
- "highway/crossing",
+ "highway/crosswalk",
"railway/level_crossing",
"highway/traffic_signals",
"highway/turning_circle",
],
"relation": [
"category-route",
+ "category-restriction",
"type/boundary",
- "type/restriction",
"type/multipolygon",
"relation"
]
"landuse/farmyard",
"landuse/forest",
"landuse/meadow",
- "landuse/cemetery"
+ "landuse/cemetery",
+ "landuse/military"
]
},
"category-path": {
"railway/abandoned"
]
},
+ "category-restriction": {
+ "geometry": "relation",
+ "name": "Restriction",
+ "icon": "restriction",
+ "members": [
+ "type/restriction/no_left_turn",
+ "type/restriction/no_right_turn",
+ "type/restriction/no_straight_on",
+ "type/restriction/no_u_turn",
+ "type/restriction/only_left_turn",
+ "type/restriction/only_right_turn",
+ "type/restriction/only_straight_on",
+ "type/restriction"
+ ]
+ },
"category-road": {
"geometry": "line",
"name": "Road",
"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": "typeCombo",
"label": "Type"
},
+ "except": {
+ "key": "except",
+ "type": "combo",
+ "label": "Exceptions"
+ },
"fax": {
"key": "fax",
"type": "tel",
"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",
"oneway": {
"key": "oneway",
"type": "check",
- "label": "One Way"
+ "label": "One Way",
+ "strings": {
+ "options": {
+ "undefined": "Assumed to be No",
+ "yes": "Yes",
+ "no": "No"
+ }
+ }
},
"oneway_yes": {
"key": "oneway",
"type": "check",
"default": "yes",
- "label": "One Way"
+ "label": "One Way",
+ "strings": {
+ "options": {
+ "undefined": "Assumed to be Yes",
+ "yes": "Yes",
+ "no": "No"
+ }
+ }
},
"opening_hours": {
"key": "opening_hours",
"type": "typeCombo",
"label": "Type"
},
+ "population": {
+ "key": "population",
+ "type": "text",
+ "label": "Population"
+ },
"power": {
"key": "power",
"type": "typeCombo",
"type": "combo",
"label": "Type"
},
+ "restrictions": {
+ "type": "restrictions",
+ "geometry": "vertex",
+ "icon": "restrictions",
+ "reference": {
+ "rtype": "restriction"
+ },
+ "label": "Turn Restrictions"
+ },
"route": {
"key": "route",
"type": "combo",
"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,
920,
25
]
+ },
+ "restriction-no-straight-on": {
+ "relation": [
+ 980,
+ 25
+ ]
+ },
+ "restriction-no-u-turn": {
+ "relation": [
+ 1040,
+ 25
+ ]
+ },
+ "restriction-no-left-turn": {
+ "relation": [
+ 1100,
+ 25
+ ]
+ },
+ "restriction-no-right-turn": {
+ "relation": [
+ 1160,
+ 25
+ ]
+ },
+ "restriction-only-straight-on": {
+ "relation": [
+ 1220,
+ 25
+ ]
+ },
+ "restriction-only-left-turn": {
+ "relation": [
+ 1280,
+ 25
+ ]
+ },
+ "restriction-only-right-turn": {
+ "relation": [
+ 1340,
+ 25
+ ]
}
},
"operations": {
"icon-operation-disabled-continue": [
220,
160
+ ],
+ "icon-restriction-yes": [
+ 50,
+ 80
+ ],
+ "icon-restriction-no": [
+ 95,
+ 80
+ ],
+ "icon-restriction-only": [
+ 140,
+ 80
+ ],
+ "icon-restriction-yes-u": [
+ 185,
+ 80
+ ],
+ "icon-restriction-no-u": [
+ 230,
+ 80
+ ],
+ "icon-restriction-only-u": [
+ 275,
+ 80
]
},
"locales": [
"nl",
"en-GB",
"et",
- "fil",
"fi",
"fr",
"gl",
"sl",
"es",
"sv",
+ "tl",
"ta",
"te",
"tr",
},
"not_eligible": "Lines can't be split at their beginning or end.",
"multiple_ways": "There are too many lines here to split."
+ },
+ "restriction": {
+ "help": {
+ "select": "Click to select a road segment.",
+ "toggle": "Click to toggle turn restrictions.",
+ "toggle_on": "Click to add a \"{restriction}\" restriction.",
+ "toggle_off": "Click to remove the \"{restriction}\" restriction."
+ },
+ "annotation": {
+ "create": "Added a turn restriction",
+ "delete": "Deleted a turn restriction"
+ }
}
},
"undo": {
"category-rail": {
"name": "Rail"
},
+ "category-restriction": {
+ "name": "Restriction"
+ },
"category-road": {
"name": "Road"
},
"entrance": {
"label": "Type"
},
+ "except": {
+ "label": "Exceptions"
+ },
"fax": {
"label": "Fax",
"placeholder": "+31 42 123 4567"
"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..."
"label": "Type"
},
"oneway": {
- "label": "One Way"
+ "label": "One Way",
+ "options": {
+ "undefined": "Assumed to be No",
+ "yes": "Yes",
+ "no": "No"
+ }
},
"oneway_yes": {
- "label": "One Way"
+ "label": "One Way",
+ "options": {
+ "undefined": "Assumed to be Yes",
+ "yes": "Yes",
+ "no": "No"
+ }
},
"opening_hours": {
"label": "Hours"
"place": {
"label": "Type"
},
+ "population": {
+ "label": "Population"
+ },
"power": {
"label": "Type"
},
"restriction": {
"label": "Type"
},
+ "restrictions": {
+ "label": "Turn Restrictions"
+ },
"route": {
"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": "Doctor",
"terms": "doctor,doctor's office"
},
+ "amenity/dojo": {
+ "name": "Dojo / Martial Arts Academy",
+ "terms": "martial arts,dojo,dojang"
+ },
"amenity/drinking_water": {
"name": "Drinking Water",
"terms": "water fountain,potable water"
"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": "Crossing",
+ "terms": ""
+ },
+ "footway/crosswalk": {
+ "name": "Crosswalk",
"terms": "crosswalk,zebra crossing"
},
"footway/sidewalk": {
"name": "Sidewalk",
"terms": ""
},
+ "ford": {
+ "name": "Ford",
+ "terms": ""
+ },
"golf/bunker": {
"name": "Sand Trap",
"terms": "hazard,bunker"
},
"highway/crossing": {
"name": "Crossing",
+ "terms": ""
+ },
+ "highway/crosswalk": {
+ "name": "Crosswalk",
"terms": "crosswalk,zebra crossing"
},
"highway/cycleway": {
"terms": ""
},
"highway/motorway_junction": {
- "name": "Motorway Junction",
+ "name": "Motorway Junction / Exit",
"terms": ""
},
"highway/motorway_link": {
"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": ""
"terms": ""
},
"leisure/sports_center": {
- "name": "Sports Center",
+ "name": "Sports Center / Gym",
"terms": "gym"
},
"leisure/stadium": {
"name": "Video Store",
"terms": ""
},
+ "shop/wine": {
+ "name": "Wine Shop",
+ "terms": "winery"
+ },
"tourism": {
"name": "Tourism",
"terms": ""
"name": "Restriction",
"terms": ""
},
+ "type/restriction/no_left_turn": {
+ "name": "No Left Turn",
+ "terms": ""
+ },
+ "type/restriction/no_right_turn": {
+ "name": "No Right Turn",
+ "terms": ""
+ },
+ "type/restriction/no_straight_on": {
+ "name": "No Straight On",
+ "terms": ""
+ },
+ "type/restriction/no_u_turn": {
+ "name": "No U-turn",
+ "terms": ""
+ },
+ "type/restriction/only_left_turn": {
+ "name": "Left Turn Only",
+ "terms": ""
+ },
+ "type/restriction/only_right_turn": {
+ "name": "Right Turn Only",
+ "terms": ""
+ },
+ "type/restriction/only_straight_on": {
+ "name": "No Turns",
+ "terms": ""
+ },
"type/route": {
"name": "Route",
"terms": ""
projects / rails.git / blobdiff